From 99910cf46a463a2f9cd3f960ebd26577a3ad8abe Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Wed, 12 Aug 2009 20:56:25 +0000 Subject: [PATCH] (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) --- lisp/ChangeLog | 10 ++++++++++ lisp/replace.el | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ec95fd4ba52..2084098d0c8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2009-08-12 Juri Linkov + + * 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 * international/mule-cmds.el (ucs-insert): Change arguments diff --git a/lisp/replace.el b/lisp/replace.el index a375c87e74f..c69b4cd3c2b 100644 --- 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. -- 2.39.2