*** empty log message ***

1 files changed, 11 insertions, 1 deletions

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 8bf1a279848..5b96deb3317 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -90,6 +90,7 @@ are found.")
 
 (defvar compilation-error-regexp-alist
   '(
+    ;; NOTE!  This first one is repeated in grep-regexp-alist, below.
     ;; 4.3BSD grep, cc, lint pass 1:
     ;; /usr/src/foo/foo.c(8): warning: w may be used before set
     ;; or GNU utilities
@@ -122,6 +123,10 @@ are found.")
 compilation.  If REGEXP matches, the FILE-IDX'th subexpression gives the file
 name, and the LINE-IDX'th subexpression gives the line number.")
 
+(defvar grep-regexp-alist
+  '(("^\\([^:( \t\n]+\\)[:( \t]+\\([0-9]+\\)[:) \t]" 1 2))
+  "Regexp used to match grep hits.  See `compilation-error-regexp-alist'.")
+
 ;;;###autoload
 (defvar compilation-search-path '(nil)
   "*List of directories to search for source files named in error messages.
@@ -205,7 +210,9 @@ easily repeat a grep command."
    (list (read-from-minibuffer "Run grep (like this): "
                                "grep -n " nil nil 'grep-history)))
   (compile-internal (concat command-args " /dev/null")
-                    "No more grep hits" "grep"))
+                    "No more grep hits" "grep"
+                    ;; Give it a simpler regexp to match.
+                    nil grep-regexp-alist))
 
 (defun compile-internal (command error-message
                                  &optional name-of-mode parser regexp-alist
@@ -545,6 +552,9 @@ other kinds of prefix arguments are ignored."
   (setq compilation-last-buffer (current-buffer))
   (compile-reinitialize-errors argp (point))
 
+  ;; Move to bol; the marker for the error on this line will point there.
+  (beginning-of-line)
+
   ;; Move compilation-error-list to the elt of compilation-old-error-list
   ;; we want.
   (setq compilation-error-list compilation-old-error-list)