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

[Miles Bader]

Index: emacs/lisp/progmodes/grep.el
diff -c emacs/lisp/progmodes/grep.el:1.10.2.6 
emacs/lisp/progmodes/grep.el:1.10.2.7
*** emacs/lisp/progmodes/grep.el:1.10.2.6       Sat Sep  4 09:14:25 2004
--- emacs/lisp/progmodes/grep.el        Thu Sep  9 09:36:33 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
***************
*** 74,81 ****
  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 'boolean
    :version "21.4"
    :group 'grep)
  
--- 74,86 ----
  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))
    :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))
--- 115,120 ----
***************
*** 181,186 ****
--- 185,191 ----
    (let ((map (cons 'keymap compilation-minor-mode-map)))
      (define-key map " " 'scroll-up)
      (define-key map "\^?" 'scroll-down)
+     (define-key map "\C-c\C-f" 'next-error-follow-minor-mode)
  
      ;; This is intolerable -- rms
  ;;;    (define-key map [remap next-line] 'compilation-next-error)
***************
*** 332,338 ****
  (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"))
***************
*** 414,420 ****
                   (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
--- 421,438 ----
                   (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
***************
*** 482,488 ****
                         command-args)
                       'grep-mode nil highlight-regexp)))
  
! ;;;###autoload (autoload 'grep-mode "grep" nil t)
  (define-compilation-mode grep-mode "Grep"
    "Sets `grep-last-buffer' and `compilation-window-height'."
    (setq grep-last-buffer (current-buffer))
--- 500,516 ----
                         command-args)
                       'grep-mode nil highlight-regexp)))
  
! ;;; This doesn't work:
! ;;;      ###autoload (autoload 'grep-mode "grep" nil t)
! ;;; The ostensibly correct result is nonetheless opaque to the accounting
! ;;; done in `generate-file-autoloads'; in loaddefs.el, the generated elisp is
! ;;; correct but the generated header comment for grep.el lacks `grep-mode'.
! ;;; This approach also doesn't help other users of `define-compilation-mode'
! ;;; who wish to autoload.
! ;;;
! ;;; Better to extend autoload.el to grok `define-compilation-mode'.
! 
! ;;;###autoload
  (define-compilation-mode grep-mode "Grep"
    "Sets `grep-last-buffer' and `compilation-window-height'."
    (setq grep-last-buffer (current-buffer))