diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-04-01 23:53:10 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-04-01 23:53:10 -0700 |
| commit | c7510f6e94a232aae19e07b7203ac068ef00773c (patch) | |
| tree | e7fc371db289f18be6dd890b4adee25b88c9c5d5 | |
| parent | 6116a72722a51dbcdf2dd467e35683a386aa5f60 (diff) | |
| download | emacs-c7510f6e94a232aae19e07b7203ac068ef00773c.tar.gz | |
* lisp/simple.el (command-execute): Respect nil disabled-command-function.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/simple.el | 3 |
2 files changed, 6 insertions, 1 deletions
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)) |