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

[Miles Bader]

Index: emacs/lisp/progmodes/grep.el
diff -c emacs/lisp/progmodes/grep.el:1.3.2.7 
emacs/lisp/progmodes/grep.el:1.3.2.8
*** emacs/lisp/progmodes/grep.el:1.3.2.7        Tue Jul  6 10:17:18 2004
--- emacs/lisp/progmodes/grep.el        Tue Jul  6 10:20:17 2004
***************
*** 146,151 ****
--- 146,159 ----
    :type 'boolean
    :group 'grep)
  
+ (defcustom grep-error-screen-columns nil
+   "*If non-nil, column numbers in grep hits are screen columns.
+ See `compilation-error-screen-columns'"
+   :type '(choice (const :tag "Default" nil)
+                integer)
+   :version "21.4"
+   :group 'grep)
+ 
  ;;;###autoload
  (defcustom grep-setup-hook nil
    "List of hook functions run by `grep-process-setup' (see `run-hooks')."
***************
*** 216,222 ****
  `complation-last-buffer' rather than `grep-last-buffer'.")
  
  (defvar grep-regexp-alist
!   '(("^\\(.+?\\)[:( \t]+\\([0-9]+\\)\\([:) 
\t]\\)\\(?:\\([0-9]+\\)\\(?:-\\([0-9]+\\)\\)?\\3\\)?" 1 2 (4 . 5))
      ("^Binary file \\(.+\\) matches$" 1 nil nil 1))
    "Regexp used to match grep hits.  See `compilation-error-regexp-alist'.")
  
--- 224,232 ----
  `complation-last-buffer' rather than `grep-last-buffer'.")
  
  (defvar grep-regexp-alist
!   '(("^\\(.+?\\)[:( \t]+\
! \\([0-9]+\\)\\([.:]?\\)\\([0-9]+\\)?\
! \\(?:-\\(?:\\([0-9]+\\)\\3\\)?\\.?\\([0-9]+\\)?\\)?[:) \t]" 1 (2 . 5) (4 . 6))
      ("^Binary file \\(.+\\) matches$" 1 nil nil 1))
    "Regexp used to match grep hits.  See `compilation-error-regexp-alist'.")