diff options
| author | Miles Bader <miles@gnu.org> | 2006-10-29 07:36:46 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-10-29 07:36:46 +0000 |
| commit | b90a614915352447f3b5de4f17d304ac7813bcfd (patch) | |
| tree | 1291def9f6375e964ca25f51c8fba732f309943d /lisp/gnus/gnus-agent.el | |
| parent | fdcd003e286ce7b1692cb768165cd27a95d1dd72 (diff) | |
| download | emacs-b90a614915352447f3b5de4f17d304ac7813bcfd.tar.gz | |
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 156-159)
- Merge from emacs--devo--0
- Update from CVS
2006-10-29 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-sum.el (gnus-set-mode-line): Quote % in group name.
2006-10-28 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-agent.el (gnus-agent-make-mode-line-string): Make it compatible
with Emacs 21 and XEmacs.
2006-10-26 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/mm-view.el: Add interactive arg to html2text autoload.
2006-10-25 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-sum.el (gnus-summary-move-article): Use no-encode for `B B'.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-487
Diffstat (limited to 'lisp/gnus/gnus-agent.el')
| -rw-r--r-- | lisp/gnus/gnus-agent.el | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el index f4e9f2e3dc9..733b7533cc1 100644 --- a/lisp/gnus/gnus-agent.el +++ b/lisp/gnus/gnus-agent.el @@ -577,7 +577,17 @@ manipulated as follows: (fboundp 'make-mode-line-mouse-map)) (propertize string 'local-map (make-mode-line-mouse-map mouse-button mouse-func) - 'mouse-face 'mode-line-highlight) + 'mouse-face + (cond ((and (featurep 'xemacs) + ;; XEmacs' `facep' only checks for a face + ;; object, not for a face name, so it's useless + ;; to check with `facep'. + (find-face 'modeline)) + 'modeline) + ((facep 'mode-line-highlight) ;; Emacs 22 + 'mode-line-highlight) + ((facep 'mode-line) ;; Emacs 21 + 'mode-line)) ) string)) (defun gnus-agent-toggle-plugged (set-to) |