[Emacs-diffs] Changes to emacs/lisp/locate.el,v

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    06/09/09 10:33:42

Index: locate.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/locate.el,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- locate.el   4 Jul 2006 00:03:53 -0000       1.37
+++ locate.el   9 Sep 2006 10:33:42 -0000       1.38
@@ -114,6 +114,7 @@
 
 ;; Variables
 
+(defvar locate-current-search nil)
 (defvar locate-current-filter nil)
 
 (defgroup locate nil
@@ -289,29 +290,36 @@
         (run-locate-command
          (or (and current-prefix-arg (not locate-prompt-for-command))
              (and (not current-prefix-arg) locate-prompt-for-command)))
+         locate-buffer
         )
 
     ;; Find the Locate buffer
-    (save-window-excursion
-      (set-buffer (get-buffer-create locate-buffer-name))
+    (setq locate-buffer (if (eq major-mode 'locate-mode)
+                            (current-buffer)
+                          (get-buffer-create locate-buffer-name)))
+
+    (save-excursion
+      (set-buffer locate-buffer)
       (locate-mode)
+
       (let ((inhibit-read-only t)
            (buffer-undo-list t))
        (erase-buffer)
 
-       (setq locate-current-filter filter)
+        (set (make-local-variable 'locate-current-search) search-string)
+        (set (make-local-variable 'locate-current-filter) filter)
 
        (if run-locate-command
-           (shell-command search-string locate-buffer-name)
+            (shell-command search-string)
          (apply 'call-process locate-cmd nil t nil locate-cmd-args))
 
        (and filter
             (locate-filter-output filter))
 
-       (locate-do-setup search-string)
-       ))
-    (and (not (string-equal (buffer-name) locate-buffer-name))
-       (switch-to-buffer-other-window locate-buffer-name))
+        (locate-do-setup search-string)))
+
+    (unless (eq (current-buffer) locate-buffer)
+      (switch-to-buffer-other-window locate-buffer))
 
     (run-hooks 'dired-mode-hook)
     (dired-next-line 3)                        ;move to first matching file.
@@ -461,6 +469,7 @@
         default-directory   "/"
        buffer-read-only    t
        selective-display   t)
+  (buffer-disable-undo)
   (dired-alist-add-1 default-directory (point-min-marker))
   (set (make-local-variable 'dired-directory) "/")
   (set (make-local-variable 'dired-subdir-switches) locate-ls-subdir-switches)
@@ -492,11 +501,12 @@
     ;; Nothing returned from locate command?
     (and (eobp)
         (progn
-          (kill-buffer locate-buffer-name)
-          (if locate-current-filter
+           (let ((filter locate-current-filter)) ; local
+             (kill-buffer (current-buffer))
+             (if filter
               (error "Locate: no match for %s in database using filter %s"
-                     search-string locate-current-filter)
-            (error "Locate: no match for %s in database" search-string))))
+                        search-string filter)
+               (error "Locate: no match for %s in database" search-string)))))
 
     (locate-insert-header search-string)
 
@@ -580,7 +590,6 @@
   "Revert the *Locate* buffer.
 If `locate-update-when-revert' is non-nil, offer to update the
 locate database using the shell command in `locate-update-command'."
-  (let ((str (car locate-history-list)))
     (and locate-update-when-revert
         (yes-or-no-p "Update locate database (may take a few seconds)? ")
         ;; `expand-file-name' is used in order to autoload Tramp if
@@ -588,7 +597,7 @@
         ;; is remote.
         (let ((default-directory (expand-file-name locate-update-path)))
           (shell-command locate-update-command)))
-    (locate str)))
+  (locate locate-current-search locate-current-filter))
 
 ;;; Modified three functions from `dired.el':
 ;;;   dired-find-directory,