diff lisp/prim/replace.el @ 26:441bb1e64a06 r19-15b96

Import from CVS: tag r19-15b96
author cvs
date Mon, 13 Aug 2007 08:51:32 +0200
parents bcdc7deadc19
children 131b0175ea99
line wrap: on
line diff
--- a/lisp/prim/replace.el	Mon Aug 13 08:51:05 2007 +0200
+++ b/lisp/prim/replace.el	Mon Aug 13 08:51:32 2007 +0200
@@ -581,7 +581,8 @@
       (let ((aborted t))
 	(unwind-protect
 	    (progn
-	      (isearch-highlight (match-beginning 0) (match-end 0))
+	      (if (match-beginning 0)
+		  (isearch-highlight (match-beginning 0) (match-end 0)))
 	      (next-command-event event)
 	      (setq aborted nil))
 	  (isearch-dehighlight aborted)))
@@ -735,6 +736,7 @@
 		       (if (not replaced)
 			   (progn
 			     (replace-match next-replacement nocasify literal)
+			     (store-match-data nil)
 			     (setq replaced t))))
 		      ((eq def 'automatic)
 		       (or replaced