procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Allow to customize names of executables used by grep.el"

Browse source 
This reverts commit c93ae7a1e5.
This commit is contained in:
Eli Zaretskii 2016-04-21 05:08:29 +03:00
parent 570e0fa357
commit 1ba947f275
1 changed files with 16 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

48
lisp/progmodes/grep.el
View file

@ -411,34 +411,21 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
This gets tacked on the end of the generated expressions.") This gets tacked on the end of the generated expressions.")
;;;###autoload ;;;###autoload
(defcustom grep-program (purecopy "grep") (defvar grep-program (purecopy "grep")
"The default grep program for `grep-command' and `grep-find-command'. "The default grep program for `grep-command' and `grep-find-command'.
This variable's value takes effect when `grep-compute-defaults' is called." This variable's value takes effect when `grep-compute-defaults' is called.")
:type 'string
:version "25.1"
:group 'grep)
;;;###autoload ;;;###autoload
(defcustom grep-find-program (purecopy "find") (defvar find-program (purecopy "find")
"The default find program. "The default find program.
This is used by commands like `grep-find-command', `find-dired' This is used by commands like `grep-find-command', `find-dired'
and others." and others.")
:type 'string
:version "25.1"
:group 'grep)
(define-obsolete-variable-alias 'find-program 'grep-find-program "25.1")
;;;###autoload ;;;###autoload
(defcustom grep-xargs-program (purecopy "xargs") (defvar xargs-program (purecopy "xargs")
"The default xargs program for `grep-find-command'. "The default xargs program for `grep-find-command'.
See `grep-find-use-xargs'. See `grep-find-use-xargs'.
This variable's value takes effect when `grep-compute-defaults' is called." This variable's value takes effect when `grep-compute-defaults' is called.")
:type 'string
:version "25.1"
:group 'grep)
(define-obsolete-variable-alias 'xargs-program 'grep-xargs-program "25.1")
;;;###autoload ;;;###autoload
(defvar grep-find-use-xargs nil (defvar grep-find-use-xargs nil
@ -608,14 +595,13 @@ This function is called from `compilation-filter-hook'."
(unless grep-find-use-xargs (unless grep-find-use-xargs
(setq grep-find-use-xargs (setq grep-find-use-xargs
(cond (cond
((grep-probe grep-find-program ((grep-probe find-program
`(nil nil nil ,null-device "-exec" "echo" `(nil nil nil ,null-device "-exec" "echo"
"{}" "+")) "{}" "+"))
'exec-plus) 'exec-plus)
((and ((and
(grep-probe grep-find-program (grep-probe find-program `(nil nil nil ,null-device "-print0"))
`(nil nil nil ,null-device "-print0")) (grep-probe xargs-program `(nil nil nil "-0" "echo")))
(grep-probe grep-xargs-program `(nil nil nil "-0" "echo")))
'gnu) 'gnu)
(t (t
'exec)))) 'exec))))
@ -626,11 +612,10 @@ This function is called from `compilation-filter-hook'."
;; after the pipe symbol be quoted if they use ;; after the pipe symbol be quoted if they use
;; forward slashes as directory separators. ;; forward slashes as directory separators.
(format "%s . -type f -print0 | \"%s\" -0 %s" (format "%s . -type f -print0 | \"%s\" -0 %s"
grep-find-program grep-xargs-program find-program xargs-program grep-command))
grep-command))
((memq grep-find-use-xargs '(exec exec-plus)) ((memq grep-find-use-xargs '(exec exec-plus))
(let ((cmd0 (format "%s . -type f -exec %s" (let ((cmd0 (format "%s . -type f -exec %s"
grep-find-program grep-command)) find-program grep-command))
(null (if grep-use-null-device (null (if grep-use-null-device
(format "%s " null-device) (format "%s " null-device)
""))) "")))
@ -642,8 +627,7 @@ This function is called from `compilation-filter-hook'."
(1+ (length cmd0))))) (1+ (length cmd0)))))
(t (t
(format "%s . -type f -print | \"%s\" %s" (format "%s . -type f -print | \"%s\" %s"
grep-find-program grep-xargs-program find-program xargs-program grep-command)))))
grep-command)))))
(unless grep-find-template (unless grep-find-template
(setq grep-find-template (setq grep-find-template
(let ((gcmd (format "%s <C> %s <R>" (let ((gcmd (format "%s <C> %s <R>"
@ -653,17 +637,17 @@ This function is called from `compilation-filter-hook'."
""))) "")))
(cond ((eq grep-find-use-xargs 'gnu) (cond ((eq grep-find-use-xargs 'gnu)
(format "%s <D> <X> -type f <F> -print0 | \"%s\" -0 %s" (format "%s <D> <X> -type f <F> -print0 | \"%s\" -0 %s"
grep-find-program grep-xargs-program gcmd)) find-program xargs-program gcmd))
((eq grep-find-use-xargs 'exec) ((eq grep-find-use-xargs 'exec)
(format "%s <D> <X> -type f <F> -exec %s {} %s%s" (format "%s <D> <X> -type f <F> -exec %s {} %s%s"
grep-find-program gcmd null find-program gcmd null
(shell-quote-argument ";"))) (shell-quote-argument ";")))
((eq grep-find-use-xargs 'exec-plus) ((eq grep-find-use-xargs 'exec-plus)
(format "%s <D> <X> -type f <F> -exec %s %s{} +" (format "%s <D> <X> -type f <F> -exec %s %s{} +"
grep-find-program gcmd null)) find-program gcmd null))
(t (t
(format "%s <D> <X> -type f <F> -print | \"%s\" %s" (format "%s <D> <X> -type f <F> -print | \"%s\" %s"
grep-find-program grep-xargs-program gcmd)))))))) find-program xargs-program gcmd))))))))
;; Save defaults for this host. ;; Save defaults for this host.
(setq grep-host-defaults-alist (setq grep-host-defaults-alist