[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.47 emacs/lisp/progmodes/grep.el:1.48
*** emacs/lisp/progmodes/grep.el:1.47   Sat Aug 20 21:47:40 2005
--- emacs/lisp/progmodes/grep.el        Thu Aug 25 19:09:22 2005
***************
*** 287,293 ****
       (": \\(.+\\): \\(?:Permission denied\\|No such \\(?:file or 
directory\\|device or address\\)\\)$"
        1 grep-error-face)
       ;; remove match from grep-regexp-alist before fontifying
!      ("^Grep started.*" (0 '(face nil message nil help-echo nil mouse-face 
nil) t))
       ("^Grep finished \\(?:(\\(matches found\\))\\|with \\(no matches 
found\\)\\).*"
        (0 '(face nil message nil help-echo nil mouse-face nil) t)
        (1 compilation-info-face nil t)
--- 287,294 ----
       (": \\(.+\\): \\(?:Permission denied\\|No such \\(?:file or 
directory\\|device or address\\)\\)$"
        1 grep-error-face)
       ;; remove match from grep-regexp-alist before fontifying
!      ("^Grep started.*"
!       (0 '(face nil message nil help-echo nil mouse-face nil) t))
       ("^Grep finished \\(?:(\\(matches found\\))\\|with \\(no matches 
found\\)\\).*"
        (0 '(face nil message nil help-echo nil mouse-face nil) t)
        (1 compilation-info-face nil t)
***************
*** 517,528 ****
  
    ;; Setting process-setup-function makes exit-message-function work
    ;; even when async processes aren't supported.
!   (let ((compilation-process-setup-function 'grep-process-setup)
!       (compilation-disable-input t))
!     (compilation-start (if (and grep-use-null-device null-device)
!                          (concat command-args " " null-device)
!                        command-args)
!                      'grep-mode nil highlight-regexp)))
  
  ;;;###autoload
  (define-compilation-mode grep-mode "Grep"
--- 518,527 ----
  
    ;; Setting process-setup-function makes exit-message-function work
    ;; even when async processes aren't supported.
!   (compilation-start (if (and grep-use-null-device null-device)
!                        (concat command-args " " null-device)
!                      command-args)
!                    'grep-mode nil highlight-regexp))
  
  ;;;###autoload
  (define-compilation-mode grep-mode "Grep"
***************
*** 532,537 ****
--- 531,539 ----
         grep-hit-face)
    (set (make-local-variable 'compilation-error-regexp-alist)
         grep-regexp-alist)
+   (set (make-local-variable 'compilation-process-setup-function)
+        'grep-process-setup)
+   (set (make-local-variable 'compilation-disable-input) t)
    ;; Set `font-lock-lines-before' to 0 to not refontify the previous
    ;; line where grep markers may be already removed.
    (set (make-local-variable 'font-lock-lines-before) 0))