Re: patch for locate.el when called with prefix arg

[Luc Teirlinck]

As a complement to my previous message, here is a diff showing _all_
changes since 1.37 _after_ applying the two reversions and my patch,
to show that all revisions in between are unrelated:

===File ~/locate-diff-1=====================================
*** locate.el   20 Apr 2007 18:51:04 -0500      1.37
--- locate.el   20 Apr 2007 20:10:42 -0500      
***************
*** 1,7 ****
  ;;; locate.el --- interface to the locate command
  
  ;; Copyright (C) 1996, 1998, 2001, 2002, 2003, 2004,
! ;;   2005, 2006 Free Software Foundation, Inc.
  
  ;; Author: Peter Breton <address@hidden>
  ;; Keywords: unix files
--- 1,7 ----
  ;;; locate.el --- interface to the locate command
  
  ;; Copyright (C) 1996, 1998, 2001, 2002, 2003, 2004,
! ;;   2005, 2006, 2007 Free Software Foundation, Inc.
  
  ;; Author: Peter Breton <address@hidden>
  ;; Keywords: unix files
***************
*** 115,120 ****
--- 115,122 ----
  ;; Variables
  
  (defvar locate-current-filter nil)
+ (defvar locate-local-filter nil)
+ (defvar locate-local-search nil)
  
  (defgroup locate nil
    "Interface to the locate command."
***************
*** 300,305 ****
--- 302,309 ----
        (erase-buffer)
  
        (setq 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
            (shell-command search-string locate-buffer-name)
***************
*** 422,428 ****
    (save-excursion
      (forward-line 0)
      (looking-at (concat "."
!                       (make-string (1- locate-filename-indentation) ?\ )
                        "\\(/\\|[A-Za-z]:\\)"))))
  
  (defun locate-mouse-view-file (event)
--- 426,432 ----
    (save-excursion
      (forward-line 0)
      (looking-at (concat "."
!                       (make-string (1- locate-filename-indentation) ?\s)
                        "\\(/\\|[A-Za-z]:\\)"))))
  
  (defun locate-mouse-view-file (event)
***************
*** 469,475 ****
    ;; This should support both Unix and Windoze style names
    (setq directory-listing-before-filename-regexp
        (concat "^."
!               (make-string (1- locate-filename-indentation) ?\ )
                "\\(/\\|[A-Za-z]:\\)\\|"
                (default-value 'directory-listing-before-filename-regexp)))
    (make-local-variable 'dired-actual-switches)
--- 473,479 ----
    ;; This should support both Unix and Windoze style names
    (setq directory-listing-before-filename-regexp
        (concat "^."
!               (make-string (1- locate-filename-indentation) ?\s)
                "\\(/\\|[A-Za-z]:\\)\\|"
                (default-value 'directory-listing-before-filename-regexp)))
    (make-local-variable 'dired-actual-switches)
***************
*** 477,483 ****
    (make-local-variable 'dired-permission-flags-regexp)
    (setq dired-permission-flags-regexp
        (concat "^.\\("
!               (make-string (1- locate-filename-indentation) ?\ )
                "\\)\\|"
                (default-value 'dired-permission-flags-regexp)))
    (make-local-variable 'revert-buffer-function)
--- 481,487 ----
    (make-local-variable 'dired-permission-flags-regexp)
    (setq dired-permission-flags-regexp
        (concat "^.\\("
!               (make-string (1- locate-filename-indentation) ?\s)
                "\\)\\|"
                (default-value 'dired-permission-flags-regexp)))
    (make-local-variable 'revert-buffer-function)
***************
*** 501,507 ****
      (locate-insert-header search-string)
  
      (while (not (eobp))
!       (insert-char ?\  locate-filename-indentation t)
        (locate-set-properties)
        (forward-line 1)))
    (goto-char (point-min)))
--- 505,511 ----
      (locate-insert-header search-string)
  
      (while (not (eobp))
!       (insert-char ?\s locate-filename-indentation t)
        (locate-set-properties)
        (forward-line 1)))
    (goto-char (point-min)))
***************
*** 580,586 ****
    "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
--- 584,590 ----
    "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)))
      (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,594 ****
         ;; is remote.
         (let ((default-directory (expand-file-name locate-update-path)))
           (shell-command locate-update-command)))
!     (locate str)))
  
  ;;; Modified three functions from `dired.el':
  ;;;   dired-find-directory,
--- 592,598 ----
         ;; is remote.
         (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,
============================================================