2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e1d51646046..e64d501c5b8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-15  Chong Yidong  <cyd@stupidchicken.com>
+
+        * progmodes/compile.el (compilation-error-regexp-alist-alist):
+        Disallow filenames containing " -" to avoid confusion with libtool
+        compilation messages.  Suggested by Stefan Monnier.
+
 2006-09-15  David Kastrup  <dak@gnu.org>
 
         * mouse-sel.el (mouse-sel-follow-link-p): Use event position
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index f4dd0fb5597..e6a6a8ed9c5 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -229,7 +229,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
      ;; the last line tries to rule out message where the info after the
      ;; line number starts with "SS".  --Stef
      "^\\(?:[[:alpha:]][-[:alnum:].]+: ?\\)?\
-\\([0-9]*[^0-9\n].*?\\): ?\
+\\([0-9]*[^0-9\n]\\(?:[^\n ]\\| [^-\n]\\)*?\\): ?\
 \\([0-9]+\\)\\(?:\\([.:]\\)\\([0-9]+\\)\\)?\
 \\(?:-\\([0-9]+\\)?\\(?:\\3\\([0-9]+\\)\\)?\\)?:\
 \\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\