From: Glenn Morris <rgm@gnu.org>
Date: Wed, 2 Apr 2014 06:53:10 +0000 (-0700)
Subject: * lisp/simple.el (command-execute): Respect nil disabled-command-function.
X-Git-Tag: emacs-24.3.90~59
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c7510f6e94a232aae19e07b7203ac068ef00773c;p=emacs.git

* lisp/simple.el (command-execute): Respect nil disabled-command-function.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9d474f3f27f..0bfc080f8ec 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-02  Glenn Morris  <rgm@gnu.org>
+
+	* simple.el (command-execute): Respect nil disabled-command-function.
+
 2014-04-01  Nicolas Richard  <theonewiththeevillook@yahoo.fr>
 
 	* simple.el (command-execute): Do not execute the command when it
diff --git a/lisp/simple.el b/lisp/simple.el
index 10a3a98973d..68bfd7b14f4 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1629,7 +1629,8 @@ a special event, so ignore the prefix argument and don't clear it."
                        (setq current-prefix-arg prefix-arg)
                        (setq prefix-arg nil)))))
     (if (and (symbolp cmd)
-             (get cmd 'disabled))
+             (get cmd 'disabled)
+             disabled-command-function)
         ;; FIXME: Weird calling convention!
         (run-hooks 'disabled-command-function)
       (let ((final cmd))