[Emacs-diffs] emacs-24 r116891: * lisp/simple.el (command-execute): Respect nil disabled-command-function.

[Glenn Morris]

------------------------------------------------------------
revno: 116891
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-04-01 23:53:10 -0700
message:
  * lisp/simple.el (command-execute): Respect nil disabled-command-function.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/simple.el                 simple.el-20091113204419-o5vbwnq5f7feedwu-403

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-04-02 06:51:59 +0000
+++ b/lisp/ChangeLog    2014-04-02 06:53:10 +0000
@@ -1,3 +1,7 @@
+2014-04-02  Glenn Morris  <address@hidden>
+
+       * simple.el (command-execute): Respect nil disabled-command-function.
+
 2014-04-01  Nicolas Richard  <address@hidden>
 
        * simple.el (command-execute): Do not execute the command when it

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2014-04-02 06:51:59 +0000
+++ b/lisp/simple.el    2014-04-02 06:53:10 +0000
@@ -1629,7 +1629,8 @@
                        (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))