diff options
author | Chong Yidong <cyd@stupidchicken.com> | 2010-11-27 15:04:57 -0500 |
---|---|---|
committer | Chong Yidong <cyd@stupidchicken.com> | 2010-11-27 15:04:57 -0500 |
commit | 07976ae3b816dea4fd541bbba862603d3132eb2c (patch) | |
tree | 4a437b7cb3abb01fb144530a130c991882a1b7f2 /lisp/locate.el | |
parent | 9610796712a3bc43730c99005906571a2c0bccbd (diff) | |
parent | 402c8a49571227f8a4e678d4a6cdd6ba7841aef9 (diff) | |
download | emacs-07976ae3b816dea4fd541bbba862603d3132eb2c.tar.gz |
Merge changes from emacs-23 branch
Diffstat (limited to 'lisp/locate.el')
-rw-r--r-- | lisp/locate.el | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/lisp/locate.el b/lisp/locate.el index 4e8925665ca..4c4312b9598 100644 --- a/lisp/locate.el +++ b/lisp/locate.el @@ -145,6 +145,11 @@ the version.)" :type 'string :group 'locate) +(defcustom locate-post-command-hook nil + "List of hook functions run after `locate' (see `run-hooks')." + :type 'hook + :group 'locate) + (defvar locate-history-list nil "The history list used by the \\[locate] command.") @@ -226,6 +231,11 @@ that is, with a prefix arg, you get the default behavior." :group 'locate :type 'boolean) +(defcustom locate-mode-hook nil + "List of hook functions run by `locate-mode' (see `run-mode-hooks')." + :type 'hook + :group 'locate) + ;; Functions (defun locate-default-make-command-line (search-string) @@ -471,9 +481,9 @@ do not work in subdirectories. (make-local-variable 'directory-listing-before-filename-regexp) ;; This should support both Unix and Windoze style names (setq directory-listing-before-filename-regexp - (concat "^." + (concat "^.\\(" (make-string (1- locate-filename-indentation) ?\s) - "\\(/\\|[A-Za-z]:\\)\\|" + "\\)\\|" (default-value 'directory-listing-before-filename-regexp))) (make-local-variable 'dired-actual-switches) (setq dired-actual-switches "") |