/[emacs]/emacs/lisp/isearch.el
ViewVC logotype

Diff of /emacs/lisp/isearch.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.236 by jurta, Wed Sep 1 20:32:13 2004 UTC revision 1.237 by jurta, Fri Sep 3 20:32:57 2004 UTC
# Line 1088  Use `isearch-exit' to quit without signa Line 1088  Use `isearch-exit' to quit without signa
1088    (interactive)    (interactive)
1089    (setq isearch-regexp (not isearch-regexp))    (setq isearch-regexp (not isearch-regexp))
1090    (if isearch-regexp (setq isearch-word nil))    (if isearch-regexp (setq isearch-word nil))
1091      (setq isearch-success t isearch-adjusted t)
1092    (isearch-update))    (isearch-update))
1093    
1094  (defun isearch-toggle-case-fold ()  (defun isearch-toggle-case-fold ()
# Line 1100  Use `isearch-exit' to quit without signa Line 1101  Use `isearch-exit' to quit without signa
1101               (isearch-message-prefix nil nil isearch-nonincremental)               (isearch-message-prefix nil nil isearch-nonincremental)
1102               isearch-message               isearch-message
1103               (if isearch-case-fold-search "in" "")))               (if isearch-case-fold-search "in" "")))
1104    (setq isearch-adjusted t)    (setq isearch-success t isearch-adjusted t)
1105    (sit-for 1)    (sit-for 1)
1106    (isearch-update))    (isearch-update))
1107    
1108  (defun isearch-query-replace ()  (defun isearch-query-replace (&optional regexp-flag)
1109    "Start query-replace with string to replace from last search string."    "Start query-replace with string to replace from last search string."
1110    (interactive)    (interactive)
1111    (barf-if-buffer-read-only)    (barf-if-buffer-read-only)
1112      (if regexp-flag (setq isearch-regexp t))
1113    (let ((case-fold-search isearch-case-fold-search))    (let ((case-fold-search isearch-case-fold-search))
1114      (isearch-done)      (isearch-done)
1115      (isearch-clean-overlays)      (isearch-clean-overlays)
1116      (and isearch-forward isearch-other-end (goto-char isearch-other-end))      (if (and (< isearch-other-end (point))
1117                 (not (and transient-mark-mode mark-active
1118                           (< isearch-opoint (point)))))
1119            (goto-char isearch-other-end))
1120        (set query-replace-from-history-variable
1121             (cons isearch-string
1122                   (symbol-value query-replace-from-history-variable)))
1123      (perform-replace      (perform-replace
1124       isearch-string       isearch-string
1125       (query-replace-read-to isearch-string "Query replace" isearch-regexp)       (query-replace-read-to
1126       t isearch-regexp isearch-word)))        isearch-string
1127          (if isearch-regexp "Query replace regexp" "Query replace")
1128          isearch-regexp)
1129         t isearch-regexp isearch-word nil nil
1130         (if (and transient-mark-mode mark-active) (region-beginning))
1131         (if (and transient-mark-mode mark-active) (region-end)))))
1132    
1133  (defun isearch-query-replace-regexp ()  (defun isearch-query-replace-regexp ()
1134    "Start query-replace-regexp with string to replace from last search string."    "Start query-replace-regexp with string to replace from last search string."
1135    (interactive)    (interactive)
1136    (let ((query-replace-interactive t)    (isearch-query-replace 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)))  
1137    
1138    
1139  (defun isearch-delete-char ()  (defun isearch-delete-char ()
# Line 1620  Isearch mode." Line 1626  Isearch mode."
1626             (let ((ab-bel (isearch-string-out-of-window isearch-point)))             (let ((ab-bel (isearch-string-out-of-window isearch-point)))
1627               (if ab-bel               (if ab-bel
1628                   (isearch-back-into-window (eq ab-bel 'above) isearch-point)                   (isearch-back-into-window (eq ab-bel 'above) isearch-point)
1629                 (or (eq (point) isearch-point)                 (goto-char isearch-point)))
                    (goto-char isearch-point))))  
1630             (isearch-update))             (isearch-update))
1631            (search-exit-option            (search-exit-option
1632             (let (window)             (let (window)
# Line 1895  If there is no completion possible, say Line 1900  If there is no completion possible, say
1900    ;; If currently failing, display no ellipsis.    ;; If currently failing, display no ellipsis.
1901    (or isearch-success (setq ellipsis nil))    (or isearch-success (setq ellipsis nil))
1902    (let ((m (concat (if isearch-success "" "failing ")    (let ((m (concat (if isearch-success "" "failing ")
1903                       (if isearch-adjusted "pending " "")
1904                     (if (and isearch-wrapped                     (if (and isearch-wrapped
1905                              (not isearch-wrap-function)                              (not isearch-wrap-function)
1906                              (if isearch-forward                              (if isearch-forward

Legend:
Removed from v.1.236  
changed lines
  Added in v.1.237

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26