Provide for customizing default regexp in occur commands (Bug#13892).

* lisp/replace.el (occur-read-regexp-defaults-function): New var.
(occur-read-regexp-defaults): New defun.
(occur-read-primary-args): Propagate above change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df4cf561588ca6c6e201c4579cf97d12e2a6fcef..20a3a6e1e501c1d83215aa85da633b06291bec7b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-10  Jambunathan K  <kjambunathan@gmail.com>
+
+       * replace.el (occur-read-regexp-defaults-function): New var.
+       (occur-read-regexp-defaults): New defun.
+       (occur-read-primary-args): Propagate above change (bug#13892).
+
 2013-03-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * mouse.el (mouse-drag-track): Remove left-over debugging code.

diff --git a/lisp/replace.el b/lisp/replace.el
index ceb0fe4a63e3b06658dee2d489cbb429a868ae7c..17eea19edd8e15fc3162f6af12fe24708e4877c9 100644 (file)
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1135,12 +1135,32 @@ which means to discard all text properties."
   :group 'matching
   :version "22.1")
 
+(defvar occur-read-regexp-defaults-function
+  'occur-read-regexp-defaults
+  "Function that provides default regexp(s) for occur commands.
+This function should take no arguments and return one of nil, a
+regexp or a list of regexps for use with occur commands -
+`occur', `multi-occur' and `multi-occur-in-matching-buffers'.
+The return value of this function is used as DEFAULTS param of
+`read-regexp' while executing the occur command.  This function
+is called only during interactive use.
+
+For example, to check for occurrence of symbol at point use
+
+    \(setq occur-read-regexp-defaults-function
+         'find-tag-default-as-regexp\).")
+
+(defun occur-read-regexp-defaults ()
+  "Return the latest regexp from `regexp-history'.
+See `occur-read-regexp-defaults-function' for details."
+  (car regexp-history))
+
 (defun occur-read-primary-args ()
   (let* ((perform-collect (consp current-prefix-arg))
          (regexp (read-regexp (if perform-collect
                                   "Collect strings matching regexp"
                                 "List lines matching regexp")
-                              (car regexp-history))))
+                              (funcall occur-read-regexp-defaults-function))))
     (list regexp
          (if perform-collect
              ;; Perform collect operation