From 8674173394ab9450429e7af6fc29a7e86cd9e2bc Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Fri, 29 Oct 2010 11:24:23 +0000 Subject: [PATCH] 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. --- lisp/gnus/ChangeLog | 7 +++++++ lisp/gnus/gnus-group.el | 7 ++----- lisp/gnus/gnus.el | 3 --- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index c368d84cccf..84dc4258347 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,10 @@ +2010-10-29 Julien Danjou + + * 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 * gnus-art.el (gnus-article-goto-part): Work for article narrowed by ^L. diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index 3f3cd24963f..a777beb7485 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -1090,8 +1090,7 @@ When FORCE, rebuild the tool bar." (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 @@ if it is a string, only list groups matching REGEXP." (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. diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index bd78c6aef35..965f789587e 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -308,9 +308,6 @@ be set in `.emacs' instead." :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) -- 2.11.4.GIT