Changes committed gnus/lisp (ChangeLog gnus-art.el)

Modified: ChangeLog gnus-art.el

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


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1731 gnus/lisp/ChangeLog:7.1732
--- ChangeLog:7.1731	Tue Jan 15 00:22:44 2008
+++ ChangeLog	Wed Jan 16 12:59:19 2008
@@ -1,3 +1,8 @@
+2008-01-16  Katsumi Yamaoka  <[email protected]>
+
+	* gnus-art.el (gnus-article-describe-bindings): Show all `S' prefix
+	keys when no argument is given.
+
 2008-01-14  Reiner Steib  <[email protected]>
 
 	* imap.el (imap-ping-server): New variable.
Index: gnus-art.el
diff -u gnus/lisp/gnus-art.el:7.253 gnus/lisp/gnus-art.el:7.254
--- gnus-art.el:7.253	Fri Jan 11 11:47:34 2008
+++ gnus-art.el	Wed Jan 16 12:59:19 2008
@@ -6430,7 +6430,11 @@
 	  (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 @@
 	(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))