[gnus git] branch master updated: m0-13-37-g1c5a2d1 =1= Do not overwrite preexisting contents of unread-command-events

       via  1c5a2d18ae5382304e3f073c3da5e943327a8f87 (commit)
      from  d588ae3db11ee057d2fc3dfa5364dcfe3f84e368 (commit)


- Log -----------------------------------------------------------------
commit 1c5a2d18ae5382304e3f073c3da5e943327a8f87
Author: David Kastrup <[email protected]>
Date:   Tue Aug 4 22:23:13 2015 +0000

    Do not overwrite preexisting contents of unread-command-events
    
    * gnus-art.el (gnus-article-describe-key)
    (gnus-article-describe-key-briefly)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4ce2c22..6b0a8fb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-02  David Kastrup  <[email protected]>
+
+	* gnus-art.el (gnus-article-describe-key)
+	(gnus-article-describe-key-briefly):
+	Do not overwrite preexisting contents of unread-command-events.
+
 2015-08-02  Nikolaus Rath  <[email protected]>
 
 	* nnimap.el (nnimap-request-move-article)
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 8622f2a..5c8281b 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -6872,11 +6872,13 @@ KEY is a string or a vector."
       (with-current-buffer gnus-article-current-summary
 	(setq unread-command-events
 	      (if (featurep 'xemacs)
-		  (append key nil)
+		  (append key unread-command-events)
+		(nconc
 		 (mapcar (lambda (x) (if (and (integerp x) (>= x 128))
 					 (list 'meta (- x 128))
 				       x))
-			key)))
+			 key)
+		 unread-command-events)))
 	(let ((cursor-in-echo-area t)
 	      gnus-pick-mode)
 	  (describe-key (read-key-sequence nil t))))
@@ -6894,11 +6896,13 @@ KEY is a string or a vector."
       (with-current-buffer gnus-article-current-summary
 	(setq unread-command-events
 	      (if (featurep 'xemacs)
-		  (append key nil)
+		  (append key unread-command-events)
+		(nconc
 		 (mapcar (lambda (x) (if (and (integerp x) (>= x 128))
 					 (list 'meta (- x 128))
 				       x))
-			key)))
+			 key)
+		 unread-command-events)))
 	(let ((cursor-in-echo-area t)
 	      gnus-pick-mode)
 	  (describe-key-briefly (read-key-sequence nil t) insert)))

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog   |    6 ++++++
 lisp/gnus-art.el |   24 ++++++++++++++----------
 2 files changed, 20 insertions(+), 10 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project