(dired-do-create-files): On DOS/Windows, allow to

[gnu-emacs] / lisp / isearch.el

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 0a3b0e26bdb3124c1fb915fd259731c46ac8448f..9a4fb86b2b0207d315301bfa05002f17c32f8d3e 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1,6 +1,7 @@
 ;;; isearch.el --- incremental search minor mode.
 
-;; Copyright (C) 1992, 93, 94, 95, 96, 97, 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 93, 94, 95, 96, 97, 1999, 2000
+;;   Free Software Foundation, Inc.
 
 ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu>
 ;; Maintainer: FSF
@@ -266,6 +267,11 @@ Default value, nil, means edit the string instead."
       ;; Several non-printing chars change the searching behavior.
       (define-key map "\C-s" 'isearch-repeat-forward)
       (define-key map "\C-r" 'isearch-repeat-backward)
+      ;; Define M-C-s and M-C-r like C-s and C-r so that the same key
+      ;; combinations can be used to repeat regexp isearches that can
+      ;; be used to start these searches.
+      (define-key map "\M-\C-s" 'isearch-repeat-forward)
+      (define-key map "\M-\C-r" 'isearch-repeat-backward)
       (define-key map "\177" 'isearch-delete-char)
       (define-key map "\C-g" 'isearch-abort)
       ;; This assumes \e is the meta-prefix-char.
@@ -613,9 +619,19 @@ is treated as a regexp.  See \\[isearch-forward] for more info."
   (setq ;; quit-flag nil  not for isearch-mode
    isearch-adjusted nil
    isearch-yank-flag nil)
-  (isearch-lazy-highlight-new-loop))
+  (isearch-lazy-highlight-new-loop)
+  ;; We must prevent the point moving to the end of composition when a
+  ;; part of the composition has just been searched.
+  (setq disable-point-adjustment t))
 
 (defun isearch-done (&optional nopush edit)
+  (let ((command `(isearch-resume ,isearch-string ,isearch-regexp
+                                 ,isearch-word ,isearch-forward
+                                 ,isearch-message
+                                 ,isearch-case-fold-search)))
+    (unless (equal (car command-history) command)
+      (setq command-history (cons command command-history))))
+
   (remove-hook 'mouse-leave-buffer-hook 'isearch-done)
   ;; Called by all commands that terminate isearch-mode.
   ;; If NOPUSH is non-nil, we don't push the string on the search ring.
@@ -1021,7 +1037,8 @@ Otherwise invoke `mouse-yank-at-click'."
    (save-excursion
      (and (not isearch-forward) isearch-other-end
          (goto-char isearch-other-end))
-     (buffer-substring (point) (progn (forward-word 1) (point))))))
+     (buffer-substring-no-properties
+      (point) (progn (forward-word 1) (point))))))
 
 (defun isearch-yank-line ()
   "Pull rest of line from buffer into search string."
@@ -1030,7 +1047,7 @@ Otherwise invoke `mouse-yank-at-click'."
    (save-excursion
      (and (not isearch-forward) isearch-other-end
          (goto-char isearch-other-end))
-     (buffer-substring (point) (line-end-position)))))
+     (buffer-substring-no-properties (point) (line-end-position)))))
 
 
 (defun isearch-search-and-update ()
@@ -1144,8 +1161,22 @@ and the meta character is unread so that it applies to editing the string."
               (progn 
                 (isearch-done)
                 (apply 'isearch-unread keylist))
-            (apply 'isearch-unread
-                   (listify-key-sequence (lookup-key function-key-map key)))))
+            (setq keylist
+                  (listify-key-sequence (lookup-key function-key-map key)))
+            (while keylist
+              (setq key (car keylist))
+              ;; If KEY is a printing char, we handle it here
+              ;; directly to avoid the input method and keyboard
+              ;; coding system translating it.
+              (if (and (integerp key)
+                       (>= key ?\ ) (/= key 127) (< key 256))
+                  (progn
+                    (isearch-process-search-char key)
+                    (setq keylist (cdr keylist)))
+                ;; As the remaining keys in KEYLIST can't be handled
+                ;; here, we must reread them.
+                (apply 'isearch-unread keylist)
+                (setq keylist nil)))))
          (
           ;; Handle an undefined shifted control character
           ;; by downshifting it if that makes it defined.
@@ -1230,7 +1261,9 @@ Obsolete."
     (if (and enable-multibyte-characters
             (>= char ?\200)
             (<= char ?\377))
-       (isearch-process-search-char (unibyte-char-to-multibyte char))
+       (if (keyboard-coding-system)
+           (isearch-process-search-multibyte-characters char)
+         (isearch-process-search-char (unibyte-char-to-multibyte char)))
       (if current-input-method
          (isearch-process-search-multibyte-characters char)
        (isearch-process-search-char char)))))
@@ -1473,8 +1506,7 @@ If there is no completion possible, say so and continue searching."
                       (concat " [" current-input-method-title "]: ")
                     ": ")
                   )))
-    (aset m 0 (upcase (aref m 0)))
-    m))
+    (concat (upcase (substring m 0 1)) (substring m 1))))
 
 
 (defun isearch-message-suffix (&optional c-q-hack ellipsis)
@@ -1704,7 +1736,7 @@ If there is no completion possible, say so and continue searching."
     (or isearch-overlay (setq isearch-overlay (make-overlay beg end)))
     (move-overlay isearch-overlay beg end (current-buffer))
     (overlay-put isearch-overlay 'face
-                (if (internal-find-face 'isearch nil)
+                (if (facep 'isearch)
                     'isearch 'region))))
 
 (defun isearch-dehighlight (totally)
@@ -1914,4 +1946,18 @@ Attempt to do the search exactly the way the pending isearch would."
                   (setq isearch-lazy-highlight-end (point-min))
                 (setq isearch-lazy-highlight-start (point-max))))))))))
 
+(defun isearch-resume (search regexp word forward message case-fold)
+  "Resume an incremental search.
+SEARCH is the string or regexp searched for.
+REGEXP non-nil means the resumed search was a regexp search.
+WORD non-nil means resume a word search.
+FORWARD non-nil means resume a forward search.
+MESSAGE is the echo-area message recorded for the search resumed.
+CASE-FOLD non-nil means the search was case-insensitive."
+  (isearch-mode forward regexp nil nil word)
+  (setq isearch-string search
+       isearch-message message
+       isearch-case-fold-search case-fold)
+  (isearch-search))
+       
 ;;; isearch.el ends here