diff lisp/replace.el @ 90114:e4694597cbf4

Revision: [e-mail]--gnu-2005/emacs--unicode--0--patch-21 Merge from emacs--cvs-trunk--0 Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0 (patch 129-149) - Update from CVS - Merge from gnus--rel--5.10 - (make-text-button): Default button type if not specified - quick-install-emacs: Use mkdir --verbose only when requested * [e-mail]--gnu-2005/gnus--rel--5.10 (patch 31-33) - Merge from emacs--cvs-trunk--0 - Update from CVS

--- a/lisp/replace.el	Wed Mar 02 11:04:29 2005 +0000
+++ b/lisp/replace.el	Thu Mar 03 10:35:22 2005 +0000
@@ -1,7 +1,7 @@
 ;;; replace.el --- replace commands for Emacs
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1996, 1997, 2000, 2001, 2002,
-;;   2003, 2004  Free Software Foundation, Inc.
+;;   2003, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
@@ -116,10 +116,10 @@
 	       nil t t))))
       (if (and (zerop (length from)) lastto lastfrom)
 	  (progn
+	    (set query-replace-from-history-variable
+		 (cdr (symbol-value query-replace-from-history-variable)))
 	    (cons lastfrom
-		  (query-replace-compile-replacement lastto regexp-flag))
-	    (set query-replace-from-history-variable
-		 (cdr (symbol-value query-replace-from-history-variable))))
+		  (query-replace-compile-replacement lastto regexp-flag)))
 	;; Warn if user types \n or \t, but don't reject the input.
 	(and regexp-flag
 	     (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\[nt]\\)" from)