* lisp/help.el (where-is): Use `default' arg of completing-read.

Fixes: debbugs:17705

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 81b217c506af98cae7790f423186b6fc6461dda5..d5422deef12e486a5fb62be2cdcdddbb23432ab5 100644 (file)
--- 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 932270204c5417a6ac32bcbbaf398fad6b104e68..739eac4769d192d10ec2b79d368414f0739d5e1d 100644 (file)
--- 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)