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 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-02  David Kastrup  <dak@gnu.org>
+
+       * 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  <Nikolaus@rath.org>
 
        * nnimap.el (nnimap-request-move-article)

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 8622f2a..5c8281b 100644 (file)
--- 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)
-               (mapcar (lambda (x) (if (and (integerp x) (>= x 128))
-                                       (list 'meta (- x 128))
-                                     x))
-                       key)))
+                 (append key unread-command-events)
+               (nconc
+                (mapcar (lambda (x) (if (and (integerp x) (>= x 128))
+                                        (list 'meta (- x 128))
+                                      x))
+                        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)
-               (mapcar (lambda (x) (if (and (integerp x) (>= x 128))
-                                       (list 'meta (- x 128))
-                                     x))
-                       key)))
+                 (append key unread-command-events)
+               (nconc
+                (mapcar (lambda (x) (if (and (integerp x) (>= x 128))
+                                        (list 'meta (- x 128))
+                                      x))
+                        key)
+                unread-command-events)))
        (let ((cursor-in-echo-area t)
              gnus-pick-mode)
          (describe-key-briefly (read-key-sequence nil t) insert)))