In GNU Emacs 22.0.50.93 (i686-pc-linux-gnu, GTK+ Version 2.8.20)
of 2006-09-01 on escpc40
X server distributor `The X.Org Foundation', version 11.0.70000000
configured using `configure '--with-gtk''
Reverting Locate mode buffers (via locate-update) currently ignores
filters from locate-with-filter. It also doesn't work with uniquely
renamed buffers, or when locate has been called non-interactively
(e.g., from eshell/locate) and locate-history-list and
locate-grep-history-list aren't modified.
The attached patch has suggested changes to address these issues. If
suitable, a ChangeLog entry is:
2006-09-05 Matt Hodges <[EMAIL PROTECTED]>
* locate.el (locate-current-search): New variable.
(locate): Set buffer local value. Use current buffer if it is
in Locate mode.
(locate-mode): Disable undo here.
(locate-do-setup): Use locate-current-filter from buffer to be
killed.
(locate-update): Use locate-current-search and
locate-current-filter.
Thanks,
Matt
--- locate.el 04 Jul 2006 11:11:38 +0100 1.37
+++ locate.el 05 Sep 2006 13:15:31 +0100
@@ -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)
+ (buffer-undo-list t))
+ (erase-buffer)
+
+ (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)
+ (apply 'call-process locate-cmd nil t nil locate-cmd-args))
+
+ (and filter
+ (locate-filter-output filter))
- (setq locate-current-filter filter)
+ (locate-do-setup search-string)))
- (if run-locate-command
- (shell-command search-string locate-buffer-name)
- (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))
+ (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
- (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))))
+ (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 filter)
+ (error "Locate: no match for %s in database" search-string)))))
(locate-insert-header search-string)
@@ -580,15 +590,14 @@
"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
- ;; necessary. It cannot be loaded when `default-directory'
- ;; is remote.
- (let ((default-directory (expand-file-name locate-update-path)))
- (shell-command locate-update-command)))
- (locate str)))
+ (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
+ ;; necessary. It cannot be loaded when `default-directory'
+ ;; is remote.
+ (let ((default-directory (expand-file-name locate-update-path)))
+ (shell-command locate-update-command)))
+ (locate locate-current-search locate-current-filter))
;;; Modified three functions from `dired.el':
;;; dired-find-directory,
_______________________________________________
emacs-pretest-bug mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-pretest-bug
