master 246f050: Don't move point on undefined keystrokes in the article buffer

[Lars Ingebrigtsen]

branch: master
commit 246f050ab4ba0ec9b12f03ddfa7ee3f74030f850
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Don't move point on undefined keystrokes in the article buffer
    
    * lisp/gnus/gnus-art.el (gnus-article-read-summary-keys): Don't
    move point on undefined commands (bug#38227).
---
 lisp/gnus/gnus-art.el | 47 +++++++++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 99f2371..cfb185b 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -6678,43 +6678,41 @@ not have a face in `gnus-article-boring-faces'."
           "An" "Ap" [?A (meta return)] [?A delete]))
        (nosave-in-article
         '("AS" "\C-d"))
-       keys new-sum-point)
+       keys new-sum-point gnus-pick-mode func)
     (with-current-buffer gnus-article-current-summary
-      (let (gnus-pick-mode)
-       (setq unread-command-events (nconc unread-command-events
-                                          (list (or key last-command-event)))
-             keys (read-key-sequence nil t))))
+      (setq unread-command-events (nconc unread-command-events
+                                        (list (or key last-command-event)))
+           keys (read-key-sequence nil t)
+           func (key-binding keys t)))
 
     (message "")
 
+    (when (eq func 'undefined)
+      (error "%s is undefined" keys))
+
     (cond
      ((eq (aref keys (1- (length keys))) ?\C-h)
       (gnus-article-describe-bindings (substring keys 0 -1)))
      ((or (member keys nosaves)
          (member keys nosave-but-article)
          (member keys nosave-in-article))
-      (let (func)
-       (with-current-buffer gnus-article-current-summary
-         ;; We disable the pick minor mode commands.
-         (let (gnus-pick-mode)
-           (setq func (key-binding keys t))))
-       (if (or (not func)
-               (numberp func))
-           (ding)
-         (unless (member keys nosave-in-article)
-           (set-buffer gnus-article-current-summary))
-         (when (and (symbolp func)
-                    (get func 'disabled))
-           (error "Function %s disabled" func))
-         (call-interactively func)
-         (setq new-sum-point (point)))
-       (when (member keys nosave-but-article)
-         (pop-to-buffer gnus-article-buffer))))
+      (if (or (not func)
+             (numberp func))
+         (ding)
+       (unless (member keys nosave-in-article)
+         (set-buffer gnus-article-current-summary))
+       (when (and (symbolp func)
+                  (get func 'disabled))
+         (error "Function %s disabled" func))
+       (call-interactively func)
+       (setq new-sum-point (point)))
+      (when (member keys nosave-but-article)
+       (pop-to-buffer gnus-article-buffer)))
      (t
       ;; These commands should restore window configuration.
       (let ((obuf (current-buffer))
            (owin (current-window-configuration))
-           win func in-buffer selected new-sum-start new-sum-hscroll err)
+           win in-buffer selected new-sum-start new-sum-hscroll err)
        (cond (not-restore-window
               (pop-to-buffer gnus-article-current-summary)
               (setq win (selected-window)))
@@ -6733,9 +6731,6 @@ not have a face in `gnus-article-boring-faces'."
                 (select-frame-set-input-focus (window-frame win))
                 (select-window win))))
        (setq in-buffer (current-buffer))
-       ;; We disable the pick minor mode commands.
-       (setq func (let (gnus-pick-mode)
-                    (key-binding keys t)))
        (when (and (symbolp func)
                   (get func 'disabled))
          (error "Function %s disabled" func))