;;; locate.el --- interface to the locate command
-;; Copyright (C) 1996, 1998, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Peter Breton <pbreton@cs.umb.edu>
;; Keywords: unix files
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
\f
;;; Code:
-(eval-when-compile
- (require 'dired))
+(require 'dired)
;; Variables
:group 'locate)
;;;###autoload
-(defcustom locate-ls-subdir-switches "-al"
+(defcustom locate-ls-subdir-switches (purecopy "-al")
"`ls' switches for inserting subdirectories in `*Locate*' buffers.
This should contain the \"-l\" switch, but not the \"-F\" or \"-b\" switches."
:type 'string
(locate-do-setup search-string)
))
(and (not (string-equal (buffer-name) locate-buffer-name))
- (switch-to-buffer-other-window locate-buffer-name))
+ (pop-to-buffer locate-buffer-name))
(run-hooks 'dired-mode-hook)
(dired-next-line 3) ;move to first matching file.
(goto-char (point-min))
(keep-lines filter))
-(defvar locate-mode-map nil
+(defvar locate-mode-map
+ (let ((map (copy-keymap dired-mode-map)))
+ ;; Undefine Useless Dired Menu bars
+ (define-key map [menu-bar Dired] 'undefined)
+ (define-key map [menu-bar subdir] 'undefined)
+ (define-key map [menu-bar mark executables] 'undefined)
+ (define-key map [menu-bar mark directory] 'undefined)
+ (define-key map [menu-bar mark directories] 'undefined)
+ (define-key map [menu-bar mark symlinks] 'undefined)
+ (define-key map [M-mouse-2] 'locate-mouse-view-file)
+ (define-key map "\C-c\C-t" 'locate-tags)
+ (define-key map "l" 'locate-do-redisplay)
+ (define-key map "U" 'dired-unmark-all-files)
+ (define-key map "V" 'locate-find-directory)
+ map)
"Local keymap for Locate mode buffers.")
-(if locate-mode-map
- nil
-
- (require 'dired)
-
- (setq locate-mode-map (copy-keymap dired-mode-map))
-
- ;; Undefine Useless Dired Menu bars
- (define-key locate-mode-map [menu-bar Dired] 'undefined)
- (define-key locate-mode-map [menu-bar subdir] 'undefined)
-
- (define-key locate-mode-map [menu-bar mark executables] 'undefined)
- (define-key locate-mode-map [menu-bar mark directory] 'undefined)
- (define-key locate-mode-map [menu-bar mark directories] 'undefined)
- (define-key locate-mode-map [menu-bar mark symlinks] 'undefined)
-
- (define-key locate-mode-map [M-mouse-2] 'locate-mouse-view-file)
- (define-key locate-mode-map "\C-c\C-t" 'locate-tags)
-
- (define-key locate-mode-map "l" 'locate-do-redisplay)
- (define-key locate-mode-map "U" 'dired-unmark-all-files)
- (define-key locate-mode-map "V" 'locate-find-directory)
-)
;; This variable is used to indent the lines and then to search for
;; the file name
meaningless. You can check whether the current line contains a file
listed by the locate program, using the function
`locate-main-listing-line-p'."
- (save-excursion
- (end-of-line)
- (let ((eol (point)))
- (beginning-of-line)
-
- ;; Assumes names end at the end of the line
- (forward-char locate-filename-indentation)
- (list (point) eol))))
+ (list (+ locate-filename-indentation
+ (line-beginning-position))
+ ;; Assume names end at the end of the line.
+ (line-end-position)))
;; From SQL-mode
(defun locate-current-line-number ()
(provide 'locate)
-;;; arch-tag: 60c4d098-b5d5-4b3c-a3e0-51a2e9f43898
+;; arch-tag: 60c4d098-b5d5-4b3c-a3e0-51a2e9f43898
;;; locate.el ends here