# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1132826351 0
# Node ID 27f5bb6b18ad638ded175532cb7780a00650b47d
# Parent  cb7a3d50315346d1bad73d913444e39c0d1b3073
(isearch-repeat): With empty search ring set `isearch-error' to the
error string instead of signaling error with the function `error'.

diff -r cb7a3d503153 -r 27f5bb6b18ad lisp/isearch.el
--- a/lisp/isearch.el	Thu Nov 24 08:20:41 2005 +0000
+++ b/lisp/isearch.el	Thu Nov 24 09:59:11 2005 +0000
@@ -1138,15 +1138,16 @@
       ;; C-s in forward or C-r in reverse.
       (if (equal isearch-string "")
 	  ;; If search string is empty, use last one.
-	  (setq isearch-string
-		(or (if isearch-regexp
-			(car regexp-search-ring)
-		      (car search-ring))
-		    (error "No previous search string"))
-		isearch-message
-		(mapconcat 'isearch-text-char-description
-			   isearch-string "")
-		isearch-case-fold-search isearch-last-case-fold-search)
+	  (if (null (if isearch-regexp regexp-search-ring search-ring))
+	      (setq isearch-error "No previous search string")
+	    (setq isearch-string
+		  (if isearch-regexp
+		      (car regexp-search-ring)
+		    (car search-ring))
+		  isearch-message
+		  (mapconcat 'isearch-text-char-description
+			     isearch-string "")
+		  isearch-case-fold-search isearch-last-case-fold-search))
 	;; If already have what to search for, repeat it.
 	(or isearch-success
 	    (progn