Mercurial > emacs
changeset 111230:bf96ffd54855
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.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Fri, 29 Oct 2010 11:24:23 +0000 |
| parents | 9450439a37a3 |
| children | d66d04803828 |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-group.el lisp/gnus/gnus.el |
| diffstat | 3 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Fri Oct 29 12:49:27 2010 +0200 +++ b/lisp/gnus/ChangeLog Fri Oct 29 11:24:23 2010 +0000 @@ -1,3 +1,10 @@ +2010-10-29 Julien Danjou <julien@danjou.info> + + * 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 <yamaoka@jpl.org> * gnus-art.el (gnus-article-goto-part): Work for article narrowed by ^L.
--- a/lisp/gnus/gnus-group.el Fri Oct 29 12:49:27 2010 +0200 +++ b/lisp/gnus/gnus-group.el Fri Oct 29 11:24:23 2010 +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.
--- a/lisp/gnus/gnus.el Fri Oct 29 12:49:27 2010 +0200 +++ b/lisp/gnus/gnus.el Fri Oct 29 11:24:23 2010 +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)