[Emacs-diffs] /srv/bzr/emacs/trunk r102151: gnus-group.el (gnus-group-make-tool-bar): Check for display graphic capability before doing anything.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 102151
author: Julien Danjou <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Fri 2010-10-29 11:24:23 +0000
message:
  gnus-group.el (gnus-group-make-tool-bar): Check for display graphic 
capability before doing anything.
  gnus-group.el (gnus-group-insert-group-line): Remove useless 
gnus-group-remove-excess-properties.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-group.el
  lisp/gnus/gnus.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-10-29 07:13:33 +0000
+++ b/lisp/gnus/ChangeLog       2010-10-29 11:24:23 +0000
@@ -1,3 +1,10 @@
+2010-10-29  Julien Danjou  <address@hidden>
+
+       * gnus-group.el (gnus-group-make-tool-bar): Check for display graphic
+       capability before doing anything.
+       (gnus-group-insert-group-line): Remove useless
+       gnus-group-remove-excess-properties.
+
 2010-10-29  Katsumi Yamaoka  <address@hidden>
 
        * gnus-art.el (gnus-article-goto-part): Work for article narrowed by ^L.

=== modified file 'lisp/gnus/gnus-group.el'
--- a/lisp/gnus/gnus-group.el   2010-10-27 22:08:36 +0000
+++ b/lisp/gnus/gnus-group.el   2010-10-29 11:24:23 +0000
@@ -1090,8 +1090,7 @@
   (when (and (not (featurep 'xemacs))
             (boundp 'tool-bar-mode)
             tool-bar-mode
-            ;; The Gnus 5.10.6 code checked (default-value 'tool-bar-mode).
-            ;; Why?  --rsteib
+             (display-graphic-p)
             (or (not gnus-group-tool-bar-map) force))
     (let* ((load-path
            (gmm-image-load-path-for-library "gnus"
@@ -1607,9 +1606,7 @@
     (when (inline (gnus-visual-p 'group-highlight 'highlight))
       (gnus-group-highlight-line gnus-tmp-group beg end))
     (gnus-run-hooks 'gnus-group-update-hook)
-    (forward-line)
-    ;; Allow XEmacs to remove front-sticky text properties.
-    (gnus-group-remove-excess-properties)))
+    (forward-line)))
 
 (defun gnus-group-update-eval-form (group list)
   "Eval `car' of each element of LIST, and return the first that return t.

=== modified file 'lisp/gnus/gnus.el'
--- a/lisp/gnus/gnus.el 2010-10-21 02:44:47 +0000
+++ b/lisp/gnus/gnus.el 2010-10-29 11:24:23 +0000
@@ -308,9 +308,6 @@
   :group 'gnus-start
   :type 'boolean)
 
-(unless (fboundp 'gnus-group-remove-excess-properties)
-  (defalias 'gnus-group-remove-excess-properties 'ignore))
-
 (unless (featurep 'gnus-xmas)
   (defalias 'gnus-make-overlay 'make-overlay)
   (defalias 'gnus-delete-overlay 'delete-overlay)