diff options
| author | Glenn Morris | 2013-01-09 16:23:14 -0500 |
|---|---|---|
| committer | Glenn Morris | 2013-01-09 16:23:14 -0500 |
| commit | 89c0dda8521d9d988235cf50e4b4dae2df2956a1 (patch) | |
| tree | 32c58715c698d9d3b027dcc65dbfe826e9e4d3c0 | |
| parent | f55c06038d069eb42c4af6c0e20bc5aace139b08 (diff) | |
| download | emacs-89c0dda8521d9d988235cf50e4b4dae2df2956a1.tar.gz emacs-89c0dda8521d9d988235cf50e4b4dae2df2956a1.zip | |
execute-extended-command prompt fix (bug#13395)
* lisp/simple.el (execute-extended-command): Doc fix.
Bind prefix-arg around read-extended-command, for prompt.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/simple.el | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2df7452d5b4..1d3c92c4468 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-01-09 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * simple.el (execute-extended-command): Doc fix. | ||
| 4 | Bind prefix-arg around read-extended-command, for prompt. (Bug#13395) | ||
| 5 | |||
| 1 | 2013-01-09 Chong Yidong <cyd@gnu.org> | 6 | 2013-01-09 Chong Yidong <cyd@gnu.org> |
| 2 | 7 | ||
| 3 | * faces.el (read-face-name): Doc fix. | 8 | * faces.el (read-face-name): Doc fix. |
diff --git a/lisp/simple.el b/lisp/simple.el index 05829bbdc65..57307baad8c 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -1391,14 +1391,16 @@ If the value is non-nil and not a number, we wait 2 seconds." | |||
| 1391 | ;; Aaron S. Hawley <aaron.s.hawley(at)gmail.com> 2009-08-24 | 1391 | ;; Aaron S. Hawley <aaron.s.hawley(at)gmail.com> 2009-08-24 |
| 1392 | "Read function name, then read its arguments and call it. | 1392 | "Read function name, then read its arguments and call it. |
| 1393 | 1393 | ||
| 1394 | To pass a numeric argument to the command you are invoking with, specify | 1394 | To pass a numeric argument to the command you are invoking, specify |
| 1395 | the numeric argument to this command. | 1395 | the numeric argument to this command. |
| 1396 | 1396 | ||
| 1397 | Noninteractively, the argument PREFIXARG is the prefix argument to | 1397 | Noninteractively, the argument PREFIXARG is the prefix argument to |
| 1398 | give to the command you invoke, if it asks for an argument." | 1398 | give to the command you invoke, if it asks for an argument." |
| 1399 | (interactive (list current-prefix-arg (read-extended-command))) | 1399 | (interactive (list current-prefix-arg (read-extended-command))) |
| 1400 | ;; Emacs<24 calling-convention was with a single `prefixarg' argument. | 1400 | ;; Emacs<24 calling-convention was with a single `prefixarg' argument. |
| 1401 | (if (null command-name) (setq command-name (read-extended-command))) | 1401 | (if (null command-name) |
| 1402 | (setq command-name (let ((current-prefix-arg prefixarg)) ; for prompt | ||
| 1403 | (read-extended-command)))) | ||
| 1402 | (let* ((function (and (stringp command-name) (intern-soft command-name))) | 1404 | (let* ((function (and (stringp command-name) (intern-soft command-name))) |
| 1403 | (binding (and suggest-key-bindings | 1405 | (binding (and suggest-key-bindings |
| 1404 | (not executing-kbd-macro) | 1406 | (not executing-kbd-macro) |