diff options
| author | Lute Kamstra | 2005-02-25 11:45:05 +0000 |
|---|---|---|
| committer | Lute Kamstra | 2005-02-25 11:45:05 +0000 |
| commit | a0b497c53be2edd8140e4e61fa455f2c051aa66f (patch) | |
| tree | 055b17e8cb20145b878a57880c7af84512eac940 /lisp/replace.el | |
| parent | ff4d39263e40ffb88d9aee64f2e35b0e921c6553 (diff) | |
| download | emacs-a0b497c53be2edd8140e4e61fa455f2c051aa66f.tar.gz emacs-a0b497c53be2edd8140e4e61fa455f2c051aa66f.zip | |
(query-replace-read-from): Fix 2005-02-19 change.
Diffstat (limited to 'lisp/replace.el')
| -rw-r--r-- | lisp/replace.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/replace.el b/lisp/replace.el index 2c60cd006f1..d2a0370f93e 100644 --- a/lisp/replace.el +++ b/lisp/replace.el | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ;;; replace.el --- replace commands for Emacs | 1 | ;;; replace.el --- replace commands for Emacs |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1996, 1997, 2000, 2001, 2002, | 3 | ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1996, 1997, 2000, 2001, 2002, |
| 4 | ;; 2003, 2004 Free Software Foundation, Inc. | 4 | ;; 2003, 2004, 2005 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Maintainer: FSF | 6 | ;; Maintainer: FSF |
| 7 | 7 | ||
| @@ -116,10 +116,10 @@ wants to replace FROM with TO." | |||
| 116 | nil t t)))) | 116 | nil t t)))) |
| 117 | (if (and (zerop (length from)) lastto lastfrom) | 117 | (if (and (zerop (length from)) lastto lastfrom) |
| 118 | (progn | 118 | (progn |
| 119 | (cons lastfrom | ||
| 120 | (query-replace-compile-replacement lastto regexp-flag)) | ||
| 121 | (set query-replace-from-history-variable | 119 | (set query-replace-from-history-variable |
| 122 | (cdr (symbol-value query-replace-from-history-variable)))) | 120 | (cdr (symbol-value query-replace-from-history-variable))) |
| 121 | (cons lastfrom | ||
| 122 | (query-replace-compile-replacement lastto regexp-flag))) | ||
| 123 | ;; Warn if user types \n or \t, but don't reject the input. | 123 | ;; Warn if user types \n or \t, but don't reject the input. |
| 124 | (and regexp-flag | 124 | (and regexp-flag |
| 125 | (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\[nt]\\)" from) | 125 | (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\[nt]\\)" from) |