Mercurial > emacs

diff lisp/gnus/gnus-art.el @ 106746:e09f67191b6c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Wed, 06 Jan 2010 09:16:36 +0000
parents 40fde606ec60
children 1d1d5d9bd884
line wrap: on
line diff
--- a/lisp/gnus/gnus-art.el	Wed Jan 06 00:00:28 2010 +0000
+++ b/lisp/gnus/gnus-art.el	Wed Jan 06 09:16:36 2010 +0000
@@ -6477,10 +6477,17 @@
   (let ((keymap (copy-keymap gnus-article-mode-map))
 	(map (copy-keymap gnus-article-send-map))
 	(sumkeys (where-is-internal 'gnus-article-read-summary-keys))
-	agent draft)
+	parent agent draft)
     (define-key keymap "S" map)
     (define-key map [t] nil)
     (with-current-buffer gnus-article-current-summary
+      (set-keymap-parent
+       keymap
+       (if (setq parent (keymap-parent gnus-article-mode-map))
+	   (prog1
+	       (setq parent (copy-keymap parent))
+	     (set-keymap-parent parent (current-local-map)))
+	 (current-local-map)))
       (set-keymap-parent map (key-binding "S"))
       (let (key def gnus-pick-mode)
 	(while sumkeys