From: Cameron Desautels <camdez@gmail.com>
Date: Thu, 12 Jun 2014 02:18:54 +0000 (-0400)
Subject: * lisp/help.el (where-is): Use `default' arg of completing-read.
X-Git-Tag: emacs-25.0.90~2612^2~709^2~723
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e016b8f1529872128f756098368c45d2cbb0ae2e;p=emacs.git

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

Fixes: debbugs:17705
---

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)