[Emacs-diffs] emacs/lisp replace.el

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juri Linkov <jurta>     09/08/12 20:55:31

Modified files:
        lisp           : replace.el 

Log message:
        (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)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/replace.el?cvsroot=emacs&r1=1.283&r2=1.284

Patches:
Index: replace.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/replace.el,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -b -r1.283 -r1.284
--- replace.el  27 Feb 2009 15:31:36 -0000      1.283
+++ replace.el  12 Aug 2009 20:55:31 -0000      1.284
@@ -556,7 +556,7 @@
             (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 @@
   "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.