[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.22 emacs/lisp/progmodes/grep.el:1.23
*** emacs/lisp/progmodes/grep.el:1.22   Tue Sep  7 03:55:28 2004
--- emacs/lisp/progmodes/grep.el        Tue Sep  7 18:10:49 2004
***************
*** 65,71 ****
    :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
--- 65,71 ----
    :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
***************
*** 74,80 ****
  This option sets the environment variable GREP_COLOR to specify
  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))
--- 74,83 ----
  This option sets the environment variable GREP_COLOR to specify
  markers for highlighting and GREP_OPTIONS to add the --color
  option in front of any explicit grep options before starting
! the grep.
! 
! The default value of this variable is set up by `grep-compute-defaults';
! call that function before using this variable in your program."
    :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))
***************
*** 334,340 ****
  (defun grep-process-setup ()
    "Setup compilation variables and buffer for `grep'.
  Set up `compilation-exit-message-function' and run `grep-setup-hook'."
!   (when grep-highlight-matches
      ;; Modify `process-environment' locally bound in `compilation-start'
      (setenv "GREP_OPTIONS" (concat (getenv "GREP_OPTIONS") " --color=always"))
      (setenv "GREP_COLOR" "01;41"))
--- 337,345 ----
  (defun grep-process-setup ()
    "Setup compilation variables and buffer for `grep'.
  Set up `compilation-exit-message-function' and run `grep-setup-hook'."
!   (unless (or (not grep-highlight-matches) (eq grep-highlight-matches t))
!     (grep-compute-defaults))
!   (when (eq grep-highlight-matches t)
      ;; Modify `process-environment' locally bound in `compilation-start'
      (setenv "GREP_OPTIONS" (concat (getenv "GREP_OPTIONS") " --color=always"))
      (setenv "GREP_COLOR" "01;41"))
***************
*** 420,433 ****
    (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
--- 425,438 ----
    (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