[Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el

[Richard M. Stallman]

Index: emacs/lisp/progmodes/compile.el
diff -c emacs/lisp/progmodes/compile.el:1.260 
emacs/lisp/progmodes/compile.el:1.261
*** emacs/lisp/progmodes/compile.el:1.260       Sat Sep  7 17:29:44 2002
--- emacs/lisp/progmodes/compile.el     Mon Oct  7 18:48:47 2002
***************
*** 100,106 ****
                         (error nil))
                       1)
                (format "%s %s -e " grep-program required-options)
!             (format "%s %s " grep-program required-options)))))
    (unless grep-find-use-xargs
      (setq grep-find-use-xargs
          (if (and
--- 100,107 ----
                         (error nil))
                       1)
                (format "%s %s -e " grep-program required-options)
!             (format "%s %s " grep-program required-options))))
!    (put 'grep-command 'standard-value (list (custom-quote grep-command))))
    (unless grep-find-use-xargs
      (setq grep-find-use-xargs
          (if (and
***************
*** 110,116 ****
                 (equal (call-process "xargs" nil nil nil
                                      "-0" "-e" "echo")
                     0))
!             'gnu)))
    (unless grep-find-command
      (setq grep-find-command
          (cond ((eq grep-find-use-xargs 'gnu)
--- 111,119 ----
                 (equal (call-process "xargs" nil nil nil
                                      "-0" "-e" "echo")
                     0))
!             'gnu))
!     (put 'grep-find-use-xargs 'standard-value
!        (list (custom-quote grep-find-use-xargs))))
    (unless grep-find-command
      (setq grep-find-command
          (cond ((eq grep-find-use-xargs 'gnu)
***************
*** 121,127 ****
                           find-program grep-command))
                (t (cons (format "%s . -type f -exec %s {} %s \\;"
                                 find-program grep-command null-device)
!                        (+ 22 (length grep-command)))))))
    (unless grep-tree-command
      (setq grep-tree-command
          (let* ((glen (length grep-program))
--- 124,132 ----
                           find-program grep-command))
                (t (cons (format "%s . -type f -exec %s {} %s \\;"
                                 find-program grep-command null-device)
!                        (+ 22 (length grep-command))))))
!     (put 'grep-find-command 'standard-value
!        (list (custom-quote grep-find-command))))
    (unless grep-tree-command
      (setq grep-tree-command
          (let* ((glen (length grep-program))
***************
*** 133,139 ****
                   (format "%s <D> <X> -type f <F> -print | xargs %s <R>"
                           find-program gcmd))
                  (t (format "%s <D> <X> -type f <F> -exec %s <R> {} %s \\;"
!                            find-program gcmd null-device)))))))
  
  (defcustom grep-command nil
    "The default grep command for \\[grep].
--- 138,146 ----
                   (format "%s <D> <X> -type f <F> -print | xargs %s <R>"
                           find-program gcmd))
                  (t (format "%s <D> <X> -type f <F> -exec %s <R> {} %s \\;"
!                            find-program gcmd null-device)))))
!     (put 'grep-tree-command 'standard-value
!        (list (custom-quote grep-tree-command)))))
  
  (defcustom grep-command nil
    "The default grep command for \\[grep].