Changeset 4073 for trunk/lisp/progmodes/grep.el

Timestamp:

05/03/06 18:37:43 (3 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk (modified) (1 prop)
• trunk/lisp/progmodes/grep.el (modified) (14 diffs)

trunk/lisp/progmodes/grep.el

@@ -36 +36 @@
-
-(defgroup grep nil
-compiler
+grep
-  :group 'tools
-  :group 'processes)
@@ -46 +46 @@
-  :type '(choice (const :tag "Default" nil)
-                 integer)
-  :version "22.1"
-  :group 'grep)
-
-(defcustom grep-auto-highlight t
-  "*Specify how many grep matches to highlight (and parse) initially.
-\(Highlighting applies to an grep match when the mouse is over it.)
-If this is a number N, all grep matches in the first N lines
-are highlighted and parsed as soon as they arrive in Emacs.
-If t, highlight and parse the whole grep output as soon as it arrives.
-If nil, don't highlight or parse any of the grep buffer until you try to
-move to the error messages.
-
-Those grep matches which are not parsed and highlighted initially
-will be parsed and highlighted as soon as you try to move to them."
-  :type '(choice (const :tag "All" t)
-                 (const :tag "None" nil)
-                 (integer :tag "First N lines"))
-  :version "22.1"
-  :group 'grep)
@@ -109 +92 @@
-  :group 'grep)
-
+(defcustom grep-template nil
+  "The default command to run for \\[lgrep].
+The default value of this variable is set up by `grep-compute-defaults';
+call that function before using this variable in your program.
+The following place holders should be present in the string:
+ <C> - place to put -i if case insensitive grep.
+ <F> - file names and wildcards to search.
+ <R> - the regular expression searched for.
+ <N> - place to insert null-device."
+  :type '(choice string
+                 (const :tag "Not Set" nil))
+  :version "22.1"
+  :group 'grep)
+
-(defcustom grep-use-null-device 'auto-detect
-  "If t, append the value of `null-device' to `grep' commands.
@@ -131 +128 @@
-  :group 'grep)
-
-tree-command
-find command for \\[grep-tree
+find-template
+command to run for \\[rgrep
-The default value of this variable is set up by `grep-compute-defaults';
-call that function before using this variable in your program.
@@ -146 +143 @@
-  :group 'grep)
-
-
+
+
-        ("ch" . "*.[ch]")
-        ("c" .  "*.c")
-        ("h" .  "*.h")
+        ("asm" . "*.[sS]")
-        ("m" .  "[Mm]akefile*")
-
-
-
+
-        )
-grep-tree
+lgrep' and `rgrep
-  :type 'alist
-  :group 'grep)
-
-
-
-
-
-
-
-
-
+
+
+
-  :group 'grep)
-
@@ -209 +201 @@
-    (define-key map [menu-bar grep compilation-grep]
-      '("Another grep..." . grep))
+    (define-key map [menu-bar grep compilation-grep-find]
+      '("Recursive grep..." . grep-find))
-    (define-key map [menu-bar grep compilation-recompile]
-      '("Repeat grep" . recompile))
@@ -354 +348 @@
-(defvar grep-find-history nil)
-
+;; History of lgrep and rgrep regexp and files args.
+(defvar grep-regexp-history nil)
+(defvar grep-files-history '("ch" "el"))
+
+
-;;;###autoload
-(defun grep-process-setup ()
@@ -379 +378 @@
-  (run-hooks 'grep-setup-hook))
-
+(defun grep-probe (command args &optional func result)
+  (equal (condition-case nil
+             (apply (or func 'call-process) command args)
+           (error nil))
+         (or result 0)))
+
-;;;###autoload
-(defun grep-compute-defaults ()
@@ -386 +391 @@
-            (let ((hello-file (expand-file-name "HELLO" data-directory)))
-              (not
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                    (progn
-                      (goto-char (point-min))
@@ -403 +405 @@
-                       (concat (regexp-quote hello-file)
-                               ":[0-9]+:English")))))))))
-grep
-
-
- (if (equal (condition-case nil ; in case "grep" isn't in exec-path
-          (call-process grep-program nil nil nil
-        "-e" "foo" 
- (error nil)
-1
-
-      (format "%s %s " grep-program required-options)))))
-
-(setq grep-find-use-xargs
-  (if (and
-
-                              null-device "-print0")
-
-
-                                    "-0" "-e" "echo"
-   0
-    
-
-    
-    
-
-
-
-
-                    
-
-
-
-(unless grep-tree-command
-
-(let* ((glen (length grep-program))
- (gcmd (concat grep-program " <C>" (substring grep-command glen)
-    
-(format "%s <D> <X> -type f <F> -print0 | xargs -0 -e %s <R>
-
-
-(format "%s <D> <X> -type f <F> -print | xargs %s <R>
-
-(t (format "%s <D> <X> -type f <F> -exec %s <R>
-     find-program gcmd null-device
+(and grep-command grep-find
+
+
+(concat (if grep-use-null-device "-n" "-nH")
+   (if (grep-probe grep-program
+   `(nil nil nil "-e" "foo" ,
+          nil 1
+" -e")))
+
+(setq grep-command
+
+  (unless grep-template
+(setq grep-template
+
+(unless grep-find-use-xargs
+
+
+                  (grep-probe find-program `(nil nil nil ,null-device "-print0")
+(grep-probe "xargs" `(nil nil nil "-0" "-e" "echo")
+       
+    
+       
+       
+    
+    
+    
+    
+                       
+    
+    
+    
+    (unless grep-find-template
+
+    (let ((gcmd (format "%s <C> %s <R>"
+                 grep-program grep-options
+       
+    (format "%s . <X> -type f <F> -print0 | xargs -0 -e %s
+    
+    
+    (format "%s . <X> -type f <F> -print | xargs %s
+    
+    (t (format "%s . <X> -type f <F> -exec %s
+        find-program gcmd null-device))
-  (unless (or (not grep-highlight-matches) (eq grep-highlight-matches t))
-    (setq grep-highlight-matches
-          (with-temp-buffer
-
-
-
-
+
-                 (progn
-                   (goto-char (point-min))
@@ -488 +487 @@
-      (replace-match tag-default t t grep-default 1))))
-
-;;;###autoload
-(defun grep (command-args &optional highlight-regexp)
-  "Run grep, with user-specified args, and collect output in a buffer.
-While grep runs asynchronously, you can use \\[next-error] (M-x next-error),
-or \\<grep-mode-map>\\[compile-goto-error] in the grep \
-output buffer, to go to the lines
-where grep found matches.
-
-This command uses a special history list for its COMMAND-ARGS, so you can
-easily repeat a grep command.
-
-A prefix argument says to default the argument based upon the current
-tag the cursor is over, substituting it into the last grep command
-in the grep command history (or into `grep-command'
-if that history list is empty).
-
-If specified, optional second arg HIGHLIGHT-REGEXP is the regexp to
-temporarily highlight in visited source lines."
-  (interactive
-   (progn
-     (unless (and grep-command
-                  (or (not grep-use-null-device) (eq grep-use-null-device t)))
-       (grep-compute-defaults))
-     (let ((default (grep-default-command)))
-       (list (read-from-minibuffer "Run grep (like this): "
-                                   (if current-prefix-arg
-                                       default grep-command)
-                                   nil nil 'grep-history
-                                   (if current-prefix-arg nil default))))))
-
-  ;; Setting process-setup-function makes exit-message-function work
-  ;; even when async processes aren't supported.
-  (compilation-start (if (and grep-use-null-device null-device)
-                         (concat command-args " " null-device)
-                       command-args)
-                     'grep-mode nil highlight-regexp))
-
-;;;###autoload
@@ -537 +500 @@
-  (set (make-local-variable 'compilation-disable-input) t))
-
+
+;;;###autoload
+(defun grep (command-args)
+  "Run grep, with user-specified args, and collect output in a buffer.
+While grep runs asynchronously, you can use \\[next-error] (M-x next-error),
+or \\<grep-mode-map>\\[compile-goto-error] in the grep \
+output buffer, to go to the lines
+where grep found matches.
+
+This command uses a special history list for its COMMAND-ARGS, so you can
+easily repeat a grep command.
+
+A prefix argument says to default the argument based upon the current
+tag the cursor is over, substituting it into the last grep command
+in the grep command history (or into `grep-command'
+if that history list is empty)."
+  (interactive
+   (progn
+     (grep-compute-defaults)
+     (let ((default (grep-default-command)))
+       (list (read-from-minibuffer "Run grep (like this): "
+                                   (if current-prefix-arg
+                                       default grep-command)
+                                   nil nil 'grep-history
+                                   (if current-prefix-arg nil default))))))
+
+  ;; Setting process-setup-function makes exit-message-function work
+  ;; even when async processes aren't supported.
+  (compilation-start (if (and grep-use-null-device null-device)
+                         (concat command-args " " null-device)
+                       command-args)
+                     'grep-mode))
+
+
-;;;###autoload
-(defun grep-find (command-args)
@@ -548 +545 @@
-  (interactive
-   (progn
-
-
-
+
-     (if grep-find-command
-         (list (read-from-minibuffer "Run find (like this): "
@@ -566 +561 @@
-(defalias 'find-grep 'grep-find)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-The search is limited to file names matching shell pattern FILES.
-tree-
+
-entering `ch' is equivalent to `*.[ch]'.
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-  (interactive
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-