(gnus-article-describe-bindings): Show all `S' prefix keys when no argument is

 given.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dd59c1a..2557a10 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-art.el (gnus-article-describe-bindings): Show all `S' prefix
+       keys when no argument is given.
+
 2008-01-14  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * imap.el (imap-ping-server): New variable.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 8887a37..645d468 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -6430,7 +6430,11 @@ that prefix."
          (define-key keymap "S" map)
          (set-keymap-default-binding map nil)
          (with-current-buffer gnus-article-current-summary
-           (let (def gnus-pick-mode)
+           (let ((def (key-binding "S"))
+                 gnus-pick-mode)
+             (set-keymap-parent map (if (symbolp def)
+                                        (symbol-value def)
+                                      def))
              (dolist (key sumkeys)
                (when (setq def (key-binding key))
                  (define-key keymap key def)))))
@@ -6459,6 +6463,7 @@ that prefix."
        (define-key keymap "S" map)
        (define-key map [t] nil)
        (with-current-buffer gnus-article-current-summary
+         (set-keymap-parent map (key-binding "S"))
          (let (def gnus-pick-mode)
            (dolist (key sumkeys)
              (when (setq def (key-binding key))