(read-regexp): Return empty string when `default-value' is nil.

(keep-lines-read-args): Don't use empty string as the
default value for `read-regexp'.  (Bug#2495)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ec95fd4..2084098 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2009-08-12  Juri Linkov  <juri@jurta.org>
+
+       * progmodes/grep.el (lgrep): Ensure that `default-directory' is
+       always non-nil.  (Bug#4052)
+
+       * replace.el (read-regexp): Return empty string when
+       `default-value' is nil.
+       (keep-lines-read-args): Don't use empty string as the
+       default value for `read-regexp'.  (Bug#2495)
+
 2009-08-12  Juri Linkov  <juri@jurta.org>
 
        * international/mule-cmds.el (ucs-insert): Change arguments

diff --git a/lisp/replace.el b/lisp/replace.el
index a375c87..c69b4cd 100644 (file)
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -556,7 +556,7 @@ regexp, the last isearch string, and the last replacement regexp."
             (format "%s: " prompt))
           nil nil nil 'regexp-history defaults t)))
     (if (equal input "")
-       default-value
+       (or default-value input)
       (prog1 input
        (add-to-history 'regexp-history input)))))
 
@@ -570,7 +570,7 @@ regexp, the last isearch string, and the last replacement regexp."
   "Read arguments for `keep-lines' and friends.
 Prompt for a regexp with PROMPT.
 Value is a list, (REGEXP)."
-  (list (read-regexp prompt "") nil nil t))
+  (list (read-regexp prompt) nil nil t))
 
 (defun keep-lines (regexp &optional rstart rend interactive)
   "Delete all lines except those containing matches for REGEXP.