emacs: lisp/locate.el comparison

comparison lisp/locate.el @ 90813:e6fdae9180d4

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 698-710) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 216) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-196

author	Miles Bader <miles@gnu.org>
date	Tue, 24 Apr 2007 21:56:25 +0000
parents	95d0cdf160ea 84802af12767
children	92c344270c8a

comparison

equal deleted inserted replaced

-:6137cc8ddf90
+:e6fdae9180d4
 (eval-when-compile
 (require 'dired))
 ;; Variables
-(defvar locate-current-search nil)
 (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."
 :prefix "locate-"
 :group 'external)
 :group 'locate
 :version "22.1")
 (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)
 ;; Functions
 (save-excursion
 (skip-chars-forward "-a-zA-Z0-9.")
 (skip-chars-backward "." pt)
 (point)))))
+;; Function for use in interactive declarations.
+(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))
+(let ((locate-cmd (funcall locate-make-command-line "")))
+	(read-from-minibuffer
+	 "Run locate (like this): "
+	 (cons
+	  (concat (car locate-cmd) "  "
+		  (mapconcat 'identity (cdr locate-cmd) " "))
+	  (+ 2 (length (car locate-cmd))))
+	 nil nil 'locate-history-list))
+(let* ((default (locate-word-at-point))
+	   (input
+	    (read-from-minibuffer
+	     (if  (> (length default) 0)
+		 (format "Locate (default %s): " default)
+	       (format "Locate: "))
+	     nil nil nil 'locate-history-list default t)))
+(and (equal input "") default
+	   (setq input default))
+input)))
 ;;;###autoload
-(defun locate (search-string &optional filter)
+(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
 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."
+the docstring of that function for its meaning.
+ARG is the interactive prefix arg."
 (interactive
 (list
-(if (or (and current-prefix-arg
+(locate-prompt-for-search-string)
-		    (not locate-prompt-for-command))
+nil
-	       (and (not current-prefix-arg) locate-prompt-for-command))
+current-prefix-arg))
-	   (let ((locate-cmd (funcall locate-make-command-line "")))
-	     (read-from-minibuffer
-	      "Run locate (like this): "
-	      (cons
-	       (concat (car locate-cmd) "  "
-		       (mapconcat 'identity (cdr locate-cmd) " "))
-		       (+ 2 (length (car locate-cmd))))
-	      nil nil 'locate-history-list))
-	 (let* ((default (locate-word-at-point))
-	       (input
-		(read-from-minibuffer
-		 (if  (> (length default) 0)
-		     (format "Locate (default %s): " default)
-		   (format "Locate: "))
-		 nil nil nil 'locate-history-list default t)))
-	       (and (equal input "") default
-		    (setq input default))
-	       input))))
 (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))
+	  (or (and arg (not locate-prompt-for-command))
-	      (and (not current-prefix-arg) locate-prompt-for-command)))
+	      (and (not arg) locate-prompt-for-command)))
-locate-buffer
 	 )
 ;; Find the Locate buffer
-(setq locate-buffer (if (eq major-mode 'locate-mode)
+(save-window-excursion
-(current-buffer)
+(set-buffer (get-buffer-create locate-buffer-name))
-(get-buffer-create locate-buffer-name)))
-(save-excursion
-(set-buffer locate-buffer)
 (locate-mode)
 (let ((inhibit-read-only t)
-(buffer-undo-list t))
+	    (buffer-undo-list t))
-(erase-buffer)
+	(erase-buffer)
-(set (make-local-variable 'locate-current-search) search-string)
+	(setq locate-current-filter filter)
-(set (make-local-variable 'locate-current-filter) filter)
+	(set (make-local-variable 'locate-local-search) search-string)
+	(set (make-local-variable 'locate-local-filter) filter)
-(if run-locate-command
+	(set (make-local-variable 'locate-local-prompt) run-locate-command)
-(shell-command search-string)
-(apply 'call-process locate-cmd nil t nil locate-cmd-args))
+	(if run-locate-command
+	    (shell-command search-string locate-buffer-name)
-(and filter
+	  (apply 'call-process locate-cmd nil t nil locate-cmd-args))
-(locate-filter-output filter))
+	(and filter
-(locate-do-setup search-string)))
+	     (locate-filter-output filter))
-(unless (eq (current-buffer) locate-buffer)
+	(locate-do-setup search-string)
-(switch-to-buffer-other-window locate-buffer))
+	))
+(and (not (string-equal (buffer-name) locate-buffer-name))
+	(switch-to-buffer-other-window locate-buffer-name))
 (run-hooks 'dired-mode-hook)
 (dired-next-line 3)			;move to first matching file.
 (run-hooks 'locate-post-command-hook)
 )
 )
 ;;;###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
 prompts for both SEARCH-STRING and FILTER.  It passes SEARCH-STRING
 to the locate executable program.  It produces a `*Locate*' buffer
 that lists only those lines in the output of the locate program that
 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
+(list
-			       nil 'locate-history-list)
+(locate-prompt-for-search-string)
-	 (read-from-minibuffer "Filter: " nil nil
+(read-from-minibuffer "Filter: " nil nil
-			       nil 'locate-grep-history-list)))
+			  nil 'locate-grep-history-list)
-(locate search-string filter))
+current-prefix-arg))
+(locate search-string filter arg))
 (defun locate-filter-output (filter)
 "Filter output from the locate command."
 (goto-char (point-min))
 (keep-lines filter))
 (setq major-mode          'locate-mode
 mode-name           "Locate"
 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)
 (setq dired-switches-alist nil)
 (make-local-variable 'directory-listing-before-filename-regexp)
 (save-excursion
 ;; Nothing returned from locate command?
 (and (eobp)
 	 (progn
-(let ((filter locate-current-filter)) ; local
+	   (kill-buffer locate-buffer-name)
-(kill-buffer (current-buffer))
+	   (if locate-current-filter
-(if filter
+	       (error "Locate: no match for %s in database using filter %s"
-(error "Locate: no match for %s in database using filter %s"
+		      search-string locate-current-filter)
-search-string filter)
+	     (error "Locate: no match for %s in database" search-string))))
-(error "Locate: no match for %s in database" search-string)))))
 (locate-insert-header search-string)
 (while (not (eobp))
 (insert-char ?\s locate-filename-indentation t)
 ;; From Stephen Eglen <stephen@cns.ed.ac.uk>
 (defun locate-update (ignore1 ignore2)
 "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'."
-(and locate-update-when-revert
+(let ((locate-buffer-name (buffer-name))
-(yes-or-no-p "Update locate database (may take a few seconds)? ")
+	(locate-prompt-for-command locate-local-prompt))
-;; `expand-file-name' is used in order to autoload Tramp if
+(and locate-update-when-revert
-;; necessary.  It cannot be loaded when `default-directory'
+	 (yes-or-no-p "Update locate database (may take a few seconds)? ")
-;; is remote.
+	 ;; `expand-file-name' is used in order to autoload Tramp if
-(let ((default-directory (expand-file-name locate-update-path)))
+	 ;; necessary.  It cannot be loaded when `default-directory'
-(shell-command locate-update-command)))
+	 ;; is remote.
-(locate locate-current-search locate-current-filter))
+	 (let ((default-directory (expand-file-name locate-update-path)))
+	   (shell-command locate-update-command)))
+(locate locate-local-search locate-local-filter)))
 ;;; Modified three functions from `dired.el':
 ;;;   dired-find-directory,
 ;;;   dired-find-directory-other-window
 ;;;   dired-get-filename

Mercurial > emacs

comparison lisp/locate.el @ 90813:e6fdae9180d4