Mercurial > hg > xemacs-beta

diff lisp/prim/replace.el @ 100:4be1180a9e89 r20-1b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-1b2
author cvs
date Mon, 13 Aug 2007 09:15:11 +0200
parents c7528f8e288d
children 8eaf7971accc
line wrap: on
line diff
--- a/lisp/prim/replace.el	Mon Aug 13 09:13:58 2007 +0200
+++ b/lisp/prim/replace.el	Mon Aug 13 09:15:11 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