aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Bader2006-12-22 08:14:45 +0000
committerMiles Bader2006-12-22 08:14:45 +0000
commit9b9e104e5f73c6aaa37998af324f207170624216 (patch)
tree90ca83a220e6352288968f47d7d89718e2a5a8c7
parent7de62c3623490191300b621e451e81ac7336e0c5 (diff)
downloademacs-9b9e104e5f73c6aaa37998af324f207170624216.tar.gz
emacs-9b9e104e5f73c6aaa37998af324f207170624216.zip
Merge from gnus--rel--5.10
Patches applied: * gnus--rel--5.10 (patch 177-178) - Merge from emacs--devo--0 - Update from CVS 2006-12-20 Reiner Steib <Reiner.Steib@gmx.de> * lisp/gnus/gnus-group.el (gnus-group-tool-bar-gnome): Exchange connect and disconnect icons. Add help text. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-569
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/gnus-group.el6
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 047bac04076..317fe617c9f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
12006-12-20 Reiner Steib <Reiner.Steib@gmx.de>
2
3 * gnus-group.el (gnus-group-tool-bar-gnome): Exchange connect and
4 disconnect icons. Add help text.
5
12006-12-13 Reiner Steib <Reiner.Steib@gmx.de> 62006-12-13 Reiner Steib <Reiner.Steib@gmx.de>
2 7
3 * legacy-gnus-agent.el: Add Copyright notice. 8 * legacy-gnus-agent.el: Add Copyright notice.
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index f004a043834..3fe8d71f512 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -1018,9 +1018,11 @@ Pre-defined symbols include `gnus-group-tool-bar-gnome' and
1018 '((gnus-group-post-news "mail/compose") 1018 '((gnus-group-post-news "mail/compose")
1019 ;; Some useful agent icons? I don't use the agent so agent users should 1019 ;; Some useful agent icons? I don't use the agent so agent users should
1020 ;; suggest useful commands: 1020 ;; suggest useful commands:
1021 (gnus-agent-toggle-plugged "connect" t
1022 :visible (and gnus-agent (not gnus-plugged)))
1023 (gnus-agent-toggle-plugged "disconnect" t 1021 (gnus-agent-toggle-plugged "disconnect" t
1022 :help "Gnus is currently unplugged. Click to work online."
1023 :visible (and gnus-agent (not gnus-plugged)))
1024 (gnus-agent-toggle-plugged "connect" t
1025 :help "Gnus is currently plugged. Click to work offline."
1024 :visible (and gnus-agent gnus-plugged)) 1026 :visible (and gnus-agent gnus-plugged))
1025 ;; FIXME: gnus-agent-toggle-plugged (in gnus-agent-group-make-menu-bar) 1027 ;; FIXME: gnus-agent-toggle-plugged (in gnus-agent-group-make-menu-bar)
1026 ;; should have a better help text. 1028 ;; should have a better help text.