[Emacs-diffs] /srv/bzr/emacs/trunk r111036: * progmodes/grep.el (grep-compute-defaults): Do not pass the -e flag to xargs

[Chong Yidong]

------------------------------------------------------------
revno: 111036
fixes bug: http://debbugs.gnu.org/11703
author: Samuel Bronson <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Fri 2012-11-30 15:37:23 +0800
message:
  * progmodes/grep.el (grep-compute-defaults): Do not pass the -e flag to xargs
  for compatibility with BSD xargs.
modified:
  lisp/ChangeLog
  lisp/progmodes/grep.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-30 07:10:30 +0000
+++ b/lisp/ChangeLog    2012-11-30 07:37:23 +0000
@@ -1,3 +1,8 @@
+2012-11-30  Samuel Bronson  <address@hidden>
+
+       * 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  <address@hidden>
 
        * 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  <address@hidden>  (tiny change)
+2012-01-29  Samuel Bronson  <address@hidden>
 
        * custom.el (defcustom): Add doc link to Lisp manual (Bug#10635).
 

=== modified file 'lisp/progmodes/grep.el'
--- a/lisp/progmodes/grep.el    2012-09-20 21:57:13 +0000
+++ b/lisp/progmodes/grep.el    2012-11-30 07:37:23 +0000
@@ -586,7 +586,7 @@
                  '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 @@
                       ;; 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 @@
                                (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"