mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

* progmodes/grep.el (grep-compute-defaults): Do not pass the -e flag to xargs

Browse source 
for compatibility with BSD xargs.

Fixes: debbugs:11703
This commit is contained in:
Samuel Bronson 2012-11-30 15:37:23 +08:00 • committed by Chong Yidong
parent 53c9a337fa
commit 6fccd6e8b5
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2012-11-30 Samuel Bronson <naesten@gmail.com>
* progmodes/grep.el (grep-compute-defaults): Do not pass the -e
flag to xargs, for compatibility with BSD xargs (Bug#11703).
2012-11-30 Toru TSUNEYOSHI <t_tuneyosi@hotmail.com>
* textmodes/fill.el (fill-region-as-paragraph): Handle overshoot
@ -11610,7 +11615,7 @@
* dynamic-setting.el (font-setting-change-default-font): Don't
change the default face if SET-FONT argument is non-nil (Bug#9982).
2012-01-29 Samuel Bronson <naesten@gmail.com> (tiny change)
2012-01-29 Samuel Bronson <naesten@gmail.com>
* custom.el (defcustom): Add doc link to Lisp manual (Bug#10635).

6
lisp/progmodes/grep.el
View file

@ -586,7 +586,7 @@ This function is called from `compilation-filter-hook'."
'exec-plus)
((and
(grep-probe find-program `(nil nil nil ,null-device "-print0"))
(grep-probe xargs-program `(nil nil nil "-0" "-e" "echo")))
(grep-probe xargs-program `(nil nil nil "-0" "echo")))
'gnu)
(t
'exec))))
@ -596,7 +596,7 @@ This function is called from `compilation-filter-hook'."
;; Windows shells need the program file name
;; after the pipe symbol be quoted if they use
;; forward slashes as directory separators.
(format "%s . -type f -print0 | \"%s\" -0 -e %s"
(format "%s . -type f -print0 | \"%s\" -0 %s"
find-program xargs-program grep-command))
((memq grep-find-use-xargs '(exec exec-plus))
(let ((cmd0 (format "%s . -type f -exec %s"
@ -621,7 +621,7 @@ This function is called from `compilation-filter-hook'."
(format "%s " null-device)
"")))
(cond ((eq grep-find-use-xargs 'gnu)
(format "%s . <X> -type f <F> -print0 | \"%s\" -0 -e %s"
(format "%s . <X> -type f <F> -print0 | \"%s\" -0 %s"
find-program xargs-program gcmd))
((eq grep-find-use-xargs 'exec)
(format "%s . <X> -type f <F> -exec %s {} %s%s"