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

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      07/04/23 14:54:04

Index: locate.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/locate.el,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- locate.el   21 Apr 2007 03:28:56 -0000      1.42
+++ locate.el   23 Apr 2007 14:54:04 -0000      1.43
@@ -117,6 +117,7 @@
 (defvar locate-current-filter nil)
 (defvar locate-local-filter nil)
 (defvar locate-local-search nil)
+(defvar locate-local-prompt nil)
 
 (defgroup locate nil
   "Interface to the locate command."
@@ -221,7 +222,10 @@
 
 (defcustom locate-prompt-for-command nil
   "If non-nil, the `locate' command prompts for a command to run.
-Otherwise, that behavior is invoked via a prefix argument."
+Otherwise, that behavior is invoked via a prefix argument.
+
+Setting this option non-nil actually inverts the meaning of a prefix arg;
+that is, with a prefix arg, you get the default behavior."
   :group 'locate
   :type 'boolean)
 
@@ -241,27 +245,7 @@
        (skip-chars-backward "." pt)
        (point)))))
 
-;;;###autoload
-(defun locate (search-string &optional filter)
-  "Run the program `locate', putting results in `*Locate*' buffer.
-Pass it SEARCH-STRING as argument.  Interactively, prompt for SEARCH-STRING.
-With prefix arg, prompt for the exact shell command to run instead.
-
-This program searches for those file names in a database that match
-SEARCH-STRING and normally outputs all matching absolute file names,
-one per line.  The database normally consists of all files on your
-system, or of all files that you have access to.  Consult the
-documentation of the program for the details about how it determines
-which file names match SEARCH-STRING.  (Those details vary highly with
-the version.)
-
-You can specify another program for this command to run by customizing
-the variables `locate-command' or `locate-make-command-line'.
-
-The main use of FILTER is to implement `locate-with-filter'.  See
-the docstring of that function for its meaning."
-  (interactive
-      (list
+(defun locate-prompt-for-search-string ()
        (if (or (and current-prefix-arg
                    (not locate-prompt-for-command))
               (and (not current-prefix-arg) locate-prompt-for-command))
@@ -282,15 +266,43 @@
                 nil nil nil 'locate-history-list default t)))
               (and (equal input "") default
                    (setq input default))
-              input))))
+      input)))
+
+;;;###autoload
+(defun locate (search-string &optional filter arg)
+  "Run the program `locate', putting results in `*Locate*' buffer.
+Pass it SEARCH-STRING as argument.  Interactively, prompt for SEARCH-STRING.
+With prefix arg, prompt for the exact shell command to run instead.
+
+This program searches for those file names in a database that match
+SEARCH-STRING and normally outputs all matching absolute file names,
+one per line.  The database normally consists of all files on your
+system, or of all files that you have access to.  Consult the
+documentation of the program for the details about how it determines
+which file names match SEARCH-STRING.  (Those details vary highly with
+the version.)
+
+You can specify another program for this command to run by customizing
+the variables `locate-command' or `locate-make-command-line'.
+
+The main use of FILTER is to implement `locate-with-filter'.  See
+the docstring of that function for its meaning.
+
+ARG is the interactive prefix arg."
+  (interactive
+   (list
+    (locate-prompt-for-search-string)
+    nil
+    current-prefix-arg))
+
   (if (equal search-string "")
       (error "Please specify a filename to search for"))
   (let* ((locate-cmd-list (funcall locate-make-command-line search-string))
         (locate-cmd (car locate-cmd-list))
         (locate-cmd-args (cdr locate-cmd-list))
         (run-locate-command
-         (or (and current-prefix-arg (not locate-prompt-for-command))
-             (and (not current-prefix-arg) locate-prompt-for-command)))
+         (or (and arg (not locate-prompt-for-command))
+             (and (not arg) locate-prompt-for-command)))
         )
 
     ;; Find the Locate buffer
@@ -304,6 +316,7 @@
        (setq locate-current-filter filter)
        (set (make-local-variable 'locate-local-search) search-string)
        (set (make-local-variable 'locate-local-filter) filter)
+       (set (make-local-variable 'locate-local-prompt) run-locate-command)
 
        (if run-locate-command
            (shell-command search-string locate-buffer-name)
@@ -324,7 +337,7 @@
   )
 
 ;;;###autoload
-(defun locate-with-filter (search-string filter)
+(defun locate-with-filter (search-string filter &optional arg)
   "Run the executable program `locate' with a filter.
 This function is similar to the function `locate', which see.
 The difference is that, when invoked interactively, the present function
@@ -334,14 +347,17 @@
 contain a match for the regular expression FILTER; this is often useful
 to constrain a big search.
 
+ARG is the interactive prefix arg, which has the same effect as in `locate'.
+
 When called from Lisp, this function is identical with `locate',
 except that FILTER is not optional."
   (interactive
-   (list (read-from-minibuffer "Locate: " nil nil
-                              nil 'locate-history-list)
+   (list
+    (locate-prompt-for-search-string)
         (read-from-minibuffer "Filter: " nil nil
-                              nil 'locate-grep-history-list)))
-  (locate search-string filter))
+                         nil 'locate-grep-history-list)
+    current-prefix-arg))
+  (locate search-string filter arg))
 
 (defun locate-filter-output (filter)
   "Filter output from the locate command."
@@ -584,7 +600,8 @@
   "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 ((locate-buffer-name (buffer-name)))
+  (let ((locate-buffer-name (buffer-name))
+       (locate-prompt-for-command locate-local-prompt))
     (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