[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/isearch.el
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/isearch.el |
Date: |
Fri, 03 Sep 2004 16:38:39 -0400 |
Index: emacs/lisp/isearch.el
diff -c emacs/lisp/isearch.el:1.236 emacs/lisp/isearch.el:1.237
*** emacs/lisp/isearch.el:1.236 Wed Sep 1 20:32:13 2004
--- emacs/lisp/isearch.el Fri Sep 3 20:32:57 2004
***************
*** 1088,1093 ****
--- 1088,1094 ----
(interactive)
(setq isearch-regexp (not isearch-regexp))
(if isearch-regexp (setq isearch-word nil))
+ (setq isearch-success t isearch-adjusted t)
(isearch-update))
(defun isearch-toggle-case-fold ()
***************
*** 1100,1133 ****
(isearch-message-prefix nil nil isearch-nonincremental)
isearch-message
(if isearch-case-fold-search "in" "")))
! (setq isearch-adjusted t)
(sit-for 1)
(isearch-update))
! (defun isearch-query-replace ()
"Start query-replace with string to replace from last search string."
(interactive)
(barf-if-buffer-read-only)
(let ((case-fold-search isearch-case-fold-search))
(isearch-done)
(isearch-clean-overlays)
! (and isearch-forward isearch-other-end (goto-char isearch-other-end))
(perform-replace
isearch-string
! (query-replace-read-to isearch-string "Query replace" isearch-regexp)
! t isearch-regexp isearch-word)))
(defun isearch-query-replace-regexp ()
"Start query-replace-regexp with string to replace from last search string."
(interactive)
! (let ((query-replace-interactive t)
! (case-fold-search isearch-case-fold-search))
! ;; Put search string into the right ring
! (setq isearch-regexp t)
! (isearch-done)
! (isearch-clean-overlays)
! (and isearch-forward isearch-other-end (goto-char isearch-other-end))
! (call-interactively 'query-replace-regexp)))
(defun isearch-delete-char ()
--- 1101,1139 ----
(isearch-message-prefix nil nil isearch-nonincremental)
isearch-message
(if isearch-case-fold-search "in" "")))
! (setq isearch-success t isearch-adjusted t)
(sit-for 1)
(isearch-update))
! (defun isearch-query-replace (&optional regexp-flag)
"Start query-replace with string to replace from last search string."
(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 (point))
! (not (and transient-mark-mode mark-active
! (< isearch-opoint (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."
(interactive)
! (isearch-query-replace t))
(defun isearch-delete-char ()
***************
*** 1620,1627 ****
(let ((ab-bel (isearch-string-out-of-window isearch-point)))
(if ab-bel
(isearch-back-into-window (eq ab-bel 'above) isearch-point)
! (or (eq (point) isearch-point)
! (goto-char isearch-point))))
(isearch-update))
(search-exit-option
(let (window)
--- 1626,1632 ----
(let ((ab-bel (isearch-string-out-of-window isearch-point)))
(if ab-bel
(isearch-back-into-window (eq ab-bel 'above) isearch-point)
! (goto-char isearch-point)))
(isearch-update))
(search-exit-option
(let (window)
***************
*** 1895,1900 ****
--- 1900,1906 ----
;; If currently failing, display no ellipsis.
(or isearch-success (setq ellipsis nil))
(let ((m (concat (if isearch-success "" "failing ")
+ (if isearch-adjusted "pending " "")
(if (and isearch-wrapped
(not isearch-wrap-function)
(if isearch-forward