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

[Richard M . Stallman]

Index: emacs/lisp/progmodes/grep.el
diff -c emacs/lisp/progmodes/grep.el:1.28 emacs/lisp/progmodes/grep.el:1.29
*** emacs/lisp/progmodes/grep.el:1.28   Wed Nov  3 11:43:36 2004
--- emacs/lisp/progmodes/grep.el        Thu Nov 25 03:05:00 2004
***************
*** 247,255 ****
  
  ;;;###autoload
  (defvar grep-regexp-alist
!   '(("^\\(.+?\\)[:( \t]+\
  \\([0-9]+\\)\\([.:]?\\)\\([0-9]+\\)?\
! \\(?:-\\(?:\\([0-9]+\\)\\3\\)?\\.?\\([0-9]+\\)?\\)?[:) \t]" 1 (2 . 5) (4 . 6))
      
("^\\(.+?\\)[:(]+\\([0-9]+\\)\\([:)]\\).*?\\(\033\\[01;41m\\)\\(.*?\\)\\(\033\\[00m\\)"
       1 2
       ;; Calculate column positions (beg . end) of first grep match on a line
--- 247,258 ----
  
  ;;;###autoload
  (defvar grep-regexp-alist
!   ;; rms: I removed the code to match parens around the line number
!   ;; because it causes confusion and so we will find out if anyone needs it.
!   ;; It causes confusion with a file name that contains a number in parens.
!   '(("^\\(.+?\\)[: \t]+\
  \\([0-9]+\\)\\([.:]?\\)\\([0-9]+\\)?\
! \\(?:-\\(?:\\([0-9]+\\)\\3\\)?\\.?\\([0-9]+\\)?\\)?[: \t]" 1 (2 . 5) (4 . 6))
      
("^\\(.+?\\)[:(]+\\([0-9]+\\)\\([:)]\\).*?\\(\033\\[01;41m\\)\\(.*?\\)\\(\033\\[00m\\)"
       1 2
       ;; Calculate column positions (beg . end) of first grep match on a line