[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: query-replace in isearch (was Re: should search ring contain duplica
From: |
Juri Linkov |
Subject: |
Re: query-replace in isearch (was Re: should search ring contain duplicates?) |
Date: |
Thu, 11 May 2006 14:57:32 +0300 |
User-agent: |
Gnus/5.110004 (No Gnus v0.4) Emacs/22.0.50 (gnu/linux) |
> This reminds me of the fact that doing `query-replace' from isearch
> does not put `query-replace' in the complex command history. IMHO it
> should. i.e.: C-s FOO M-% BAR RET C-x ESC ESC should show the same
> thing as M-% FOO RET BAR RET C-x ESC ESC
>
> Would someone please fix this and ack?
The following patch should do that. It also uses `add-to-history'
to add the current search string to `query-replace-from-history-variable'
to improve code in the same function. This requires adding a new
argument KEEP-ALL to `add-to-history'. Its meaning is the same as the
argument KEEP-ALL of `read-from-minibuffer'.
Index: lisp/isearch.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/isearch.el,v
retrieving revision 1.288
diff -c -r1.288 isearch.el
*** lisp/isearch.el 5 May 2006 23:37:31 -0000 1.288
--- lisp/isearch.el 11 May 2006 11:55:45 -0000
***************
*** 1214,1220 ****
(interactive)
(barf-if-buffer-read-only)
(if regexp-flag (setq isearch-regexp t))
! (let ((case-fold-search isearch-case-fold-search))
(isearch-done)
(isearch-clean-overlays)
(if (and isearch-other-end
--- 1229,1235 ----
(interactive)
(barf-if-buffer-read-only)
(if regexp-flag (setq isearch-regexp t))
! (let ((case-fold-search isearch-case-fold-search) to)
(isearch-done)
(isearch-clean-overlays)
(if (and isearch-other-end
***************
*** 1222,1239 ****
(not (and transient-mark-mode mark-active
(< (mark) (point)))))
(goto-char isearch-other-end))
! (set query-replace-from-history-variable
! (cons isearch-string
! (symbol-value query-replace-from-history-variable)))
(perform-replace
isearch-string
! (query-replace-read-to
! isearch-string
! (if isearch-regexp "Query replace regexp" "Query replace")
! isearch-regexp)
t isearch-regexp isearch-word nil nil
(if (and transient-mark-mode mark-active) (region-beginning))
! (if (and transient-mark-mode mark-active) (region-end)))))
(defun isearch-query-replace-regexp ()
"Start query-replace-regexp with string to replace from last search string."
--- 1237,1258 ----
(not (and transient-mark-mode mark-active
(< (mark) (point)))))
(goto-char isearch-other-end))
! (add-to-history query-replace-from-history-variable isearch-string nil t)
(perform-replace
isearch-string
! (setq to (query-replace-read-to
! isearch-string
! (if isearch-regexp "Query replace regexp" "Query replace")
! isearch-regexp))
t isearch-regexp isearch-word nil nil
(if (and transient-mark-mode mark-active) (region-beginning))
! (if (and transient-mark-mode mark-active) (region-end)))
! (add-to-history
! 'command-history
! (list (if isearch-regexp 'query-replace-regexp 'query-replace)
! isearch-string to isearch-word
! '(if (and transient-mark-mode mark-active) (region-beginning))
! '(if (and transient-mark-mode mark-active) (region-end))))))
(defun isearch-query-replace-regexp ()
"Start query-replace-regexp with string to replace from last search string."
Index: lisp/subr.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/subr.el,v
retrieving revision 1.507
diff -c -r1.507 subr.el
*** lisp/subr.el 7 May 2006 20:49:01 -0000 1.507
--- lisp/subr.el 11 May 2006 11:55:55 -0000
***************
*** 1123,1151 ****
(< oa ob)
oa)))))))
! (defun add-to-history (history-var newelt &optional maxelt)
"Add NEWELT to the history list stored in the variable HISTORY-VAR.
Return the new history list.
If MAXELT is non-nil, it specifies the maximum length of the history.
Otherwise, the maximum history length is the value of the `history-length'
property on symbol HISTORY-VAR, if set, or the value of the `history-length'
variable.
! Remove duplicates of NEWELT unless `history-delete-duplicates' is nil."
(unless maxelt
(setq maxelt (or (get history-var 'history-length)
history-length)))
(let ((history (symbol-value history-var))
tail)
! (if history-delete-duplicates
(setq history (delete newelt history)))
! (setq history (cons newelt history))
! (when (integerp maxelt)
! (if (= 0 maxelt)
! (setq history nil)
! (setq tail (nthcdr (1- maxelt) history))
! (when (consp tail)
! (setcdr tail nil))))
! (set history-var history)))
;;;; Mode hooks.
--- 1123,1154 ----
(< oa ob)
oa)))))))
! (defun add-to-history (history-var newelt &optional maxelt keep-all)
"Add NEWELT to the history list stored in the variable HISTORY-VAR.
Return the new history list.
If MAXELT is non-nil, it specifies the maximum length of the history.
Otherwise, the maximum history length is the value of the `history-length'
property on symbol HISTORY-VAR, if set, or the value of the `history-length'
variable.
! Remove duplicates of NEWELT unless `history-delete-duplicates' is nil.
! KEEP-ALL, if non-nil, says to put all inputs in the history list,
! even empty or duplicate inputs."
(unless maxelt
(setq maxelt (or (get history-var 'history-length)
history-length)))
(let ((history (symbol-value history-var))
tail)
! (if (and history-delete-duplicates (null keep-all))
(setq history (delete newelt history)))
! (unless (and (null keep-all) history (equal (car history) newelt))
! (setq history (cons newelt history))
! (when (integerp maxelt)
! (if (= 0 maxelt)
! (setq history nil)
! (setq tail (nthcdr (1- maxelt) history))
! (when (consp tail)
! (setcdr tail nil))))
! (set history-var history))))
;;;; Mode hooks.
--
Juri Linkov
http://www.jurta.org/emacs/
- Re: should search ring contain duplicates?, (continued)
- Re: should search ring contain duplicates?, Stuart D. Herring, 2006/05/04
- Re: should search ring contain duplicates?, David Kastrup, 2006/05/04
- Re: should search ring contain duplicates?, Stuart D. Herring, 2006/05/04
- Re: should search ring contain duplicates?, Kim F. Storm, 2006/05/04
- query-replace in isearch (was Re: should search ring contain duplicates?), Dan Nicolaescu, 2006/05/03
- Re: query-replace in isearch, Juri Linkov, 2006/05/03
- Re: query-replace in isearch (was Re: should search ring contain duplicates?), Richard Stallman, 2006/05/03
- Re: query-replace in isearch (was Re: should search ring contain duplicates?), Richard Stallman, 2006/05/10
- Re: query-replace in isearch (was Re: should search ring contain duplicates?),
Juri Linkov <=
- Re: query-replace in isearch (was Re: should search ring contain duplicates?), Kim F. Storm, 2006/05/11
- Re: query-replace in isearch (was Re: should search ring contain duplicates?), Juri Linkov, 2006/05/11
- Re: query-replace in isearch (was Re: should search ring contain duplicates?), Juri Linkov, 2006/05/18
- Re: query-replace in isearch (was Re: should search ring contain duplicates?), Kim F. Storm, 2006/05/20
- Re: query-replace in isearch (was Re: should search ring contain duplicates?), Juri Linkov, 2006/05/21
- Re: query-replace in isearch (was Re: should search ring contain duplicates?), Richard Stallman, 2006/05/20
- Re: query-replace in isearch (was Re: should search ring contain duplicates?), Juri Linkov, 2006/05/23
- Re: query-replace in isearch (was Re: should search ring contain duplicates?), Richard Stallman, 2006/05/23
- Re: query-replace in isearch (was Re: should search ring contain duplicates?), Juri Linkov, 2006/05/25
- Re: query-replace in isearch (was Re: should search ring contain duplicates?), Richard Stallman, 2006/05/29