(gnus-article-read-summary-keys): Don't call disabled commands.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3322519..b4a1382 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-01-24  Lars Ingebrigtsen  <larsi@gnus.org>
 
+       * gnus-art.el (gnus-article-read-summary-keys): Don't call disabled
+       commands.
+
        * gnus-gravatar.el (gnus-gravatar-insert): Don't move point around
        in the article buffer.
        (gnus-gravatar-insert): Use blank space from the current buffer to

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 430590d..06817e9 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -6432,6 +6432,8 @@ not have a face in `gnus-article-boring-faces'."
            (ding)
          (unless (member keys nosave-in-article)
            (set-buffer gnus-article-current-summary))
+         (when (get func 'disabled)
+           (error "Function %s disabled" func))
          (call-interactively func)
          (setq new-sum-point (point)))
        (when (member keys nosave-but-article)
@@ -6460,8 +6462,11 @@ not have a face in `gnus-article-boring-faces'."
                 (select-window win))))
        (setq in-buffer (current-buffer))
        ;; We disable the pick minor mode commands.
-       (if (and (setq func (let (gnus-pick-mode)
-                             (key-binding keys t)))
+       (setq func (let (gnus-pick-mode)
+                    (key-binding keys t)))
+       (when (get func 'disabled)
+         (error "Function %s disabled" func))
+       (if (and func
                 (functionp func)
                 (condition-case code
                     (progn