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

[Juri Linkov]

Index: emacs/lisp/progmodes/grep.el
diff -c emacs/lisp/progmodes/grep.el:1.21 emacs/lisp/progmodes/grep.el:1.22
*** emacs/lisp/progmodes/grep.el:1.21   Sat Sep  4 12:48:19 2004
--- emacs/lisp/progmodes/grep.el        Tue Sep  7 03:55:28 2004
***************
*** 64,71 ****
    :version "21.4"
    :group 'grep)
  
! (defcustom grep-highlight-matches t
!   "*Non-nil to use special markers to highlight grep matches.
  
  Some grep programs are able to surround matches with special
  markers in grep output.  Such markers can be used to highlight
--- 64,71 ----
    :version "21.4"
    :group 'grep)
  
! (defcustom grep-highlight-matches 'auto-detect
!   "*If t, use special markers to highlight grep matches.
  
  Some grep programs are able to surround matches with special
  markers in grep output.  Such markers can be used to highlight
***************
*** 75,81 ****
  markers for highlighting and GREP_OPTIONS to add the --color
  option in front of any explicit grep options before starting
  the grep."
!   :type 'boolean
    :version "21.4"
    :group 'grep)
  
--- 75,83 ----
  markers for highlighting and GREP_OPTIONS to add the --color
  option in front of any explicit grep options before starting
  the grep."
!   :type '(choice (const :tag "Do not highlight matches with grep markers" nil)
!                (const :tag "Highlight matches with grep markers" t)
!                (other :tag "Not Set" auto-detect))
    :version "21.4"
    :group 'grep)
  
***************
*** 110,116 ****
  
  The default value of this variable is set up by `grep-compute-defaults';
  call that function before using this variable in your program."
-   :type 'boolean
    :type '(choice (const :tag "Do Not Append Null Device" nil)
                 (const :tag "Append Null Device" t)
                 (other :tag "Not Set" auto-detect))
--- 112,117 ----
***************
*** 415,421 ****
                   (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)))))))
  
  (defun grep-default-command ()
    (let ((tag-default
--- 416,433 ----
                   (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))))))
!   (unless (or (not grep-highlight-matches) (eq grep-highlight-matches t))
!     (setq grep-highlight-matches
!         (with-temp-buffer
!             (and (equal (condition-case nil
!                             (call-process grep-program nil t nil "--help")
!                           (error nil))
!                         0)
!                  (progn
!                    (goto-char (point-min))
!                    (search-forward "--color" nil t))
!                  t)))))
  
  (defun grep-default-command ()
    (let ((tag-default