diff options
| author | Cameron Desautels <camdez@gmail.com> | 2014-06-11 22:18:54 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-06-11 22:18:54 -0400 |
| commit | e016b8f1529872128f756098368c45d2cbb0ae2e (patch) | |
| tree | 5267dd059fe7f446237caf0c5ef74b920f7a3ef3 | |
| parent | 08cedf2e40738e996c5abe206426780b150f1cd7 (diff) | |
| download | emacs-e016b8f1529872128f756098368c45d2cbb0ae2e.tar.gz | |
* lisp/help.el (where-is): Use `default' arg of completing-read.
Fixes: debbugs:17705
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/help.el | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 81b217c506a..d5422deef12 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-06-12 Cameron Desautels <camdez@gmail.com> (tiny change) + + * help.el (where-is): Use `default' arg of completing-read (bug#17705). + 2014-06-12 Kevin Ryde <user42_kevin@yahoo.com.au> * files.el (auto-mode-alist): Map .ad files to xdefaults-mode diff --git a/lisp/help.el b/lisp/help.el index 932270204c5..739eac4769d 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -517,8 +517,10 @@ If INSERT (the prefix arg) is non-nil, insert the message in the buffer." (if fn (format "Where is command (default %s): " fn) "Where is command: ") - obarray 'commandp t)) - (list (if (equal val "") fn (intern val)) current-prefix-arg))) + obarray 'commandp t nil nil + (and fn (symbol-name fn)))) + (list (unless (equal val "") (intern val)) + current-prefix-arg))) (unless definition (error "No command")) (let ((func (indirect-function definition)) (defs nil) |