# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 817849098 0
# Node ID 108ac303b3e5d6da59dffc6dbd85febdf0a3e466
# Parent  13887c128ad2a17939dd20bfa9fc34ab6e8d060c
(isearch-edit-string): Consider the case when
iserch-string is empty and so are the search rings.

diff -r 13887c128ad2 -r 108ac303b3e5 lisp/isearch.el
--- a/lisp/isearch.el	Fri Dec 01 18:19:34 1995 +0000
+++ b/lisp/isearch.el	Fri Dec 01 20:18:18 1995 +0000
@@ -552,7 +552,7 @@
 	(or (and transient-mark-mode mark-active)
 	    (progn
 	      (push-mark isearch-opoint t)
-	      (or executing-macro (> (minibuffer-depth) 0)
+	      (or executing-kbd-macro (> (minibuffer-depth) 0)
 		  (message "Mark saved where search started"))))))
 
   (setq isearch-mode nil)
@@ -726,8 +726,10 @@
 
 	;; Empty isearch-string means use default.
 	(if (= 0 (length isearch-string))
-	    (setq isearch-string (car (if isearch-regexp regexp-search-ring
-					search-ring)))
+	    (setq isearch-string (or (car (if isearch-regexp
+					      regexp-search-ring
+					    search-ring))
+				     ""))
 	  ;; This used to set the last search string,
 	  ;; but I think it is not right to do that here.
 	  ;; Only the string actually used should be saved.