(locate): Show default locate pattern within the

prompt, but don't insert it into the minibuffer contents.  Catch
the case when pattern is the empty string.

1 files changed, 12 insertions, 5 deletions

diff --git a/lisp/locate.el b/lisp/locate.el
index 80dc7af7a21..6d5967a5750 100644
--- a/lisp/locate.el
+++ b/lisp/locate.el
@@ -199,11 +199,18 @@ With prefix arg, prompt for the locate command to run."
 		       (mapconcat 'identity (cdr locate-cmd) " "))
 		       (+ 2 (length (car locate-cmd))))
 	      nil nil 'locate-history-list))
-	 (read-from-minibuffer
-	  "Locate: "
-	  (locate-word-at-point)
-	  nil nil 'locate-history-list)
-	 )))
+	 (let* ((default (locate-word-at-point))
+	       (input 
+		(read-from-minibuffer
+		 (if  (> (length default) 0)
+		     (format "Locate (default `%s'): " default)
+		   (format "Locate: "))
+		 nil nil nil 'locate-history-list default t)))
+	       (and (equal input "") default
+		    (setq input default))
+	       input))))
+  (if (equal search-string "")
+      (error "Please specify a filename to search for."))
   (let* ((locate-cmd-list (funcall locate-make-command-line search-string))
 	 (locate-cmd (car locate-cmd-list))
 	 (locate-cmd-args (cdr locate-cmd-list))