diff options
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 53fbdf00087..7ef01205bd2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -2,6 +2,8 @@ | |||
| 2 | 2 | ||
| 3 | * progmodes/compile.el (compilation-error-properties): Fix | 3 | * progmodes/compile.el (compilation-error-properties): Fix |
| 4 | confusion between file struct and message struct (Bug#9319). | 4 | confusion between file struct and message struct (Bug#9319). |
| 5 | (compilation-error-regexp-alist-alist): Fix 2011-05-09 change to | ||
| 6 | `ant' regexp. | ||
| 5 | 7 | ||
| 6 | * net/browse-url.el (browse-url-firefox): Don't call | 8 | * net/browse-url.el (browse-url-firefox): Don't call |
| 7 | browse-url-firefox-sentinel unless using -remote (Bug#9328). | 9 | browse-url-firefox-sentinel unless using -remote (Bug#9328). |
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 33bd9ff96a7..2fb0ac879b2 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el | |||
| @@ -145,7 +145,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1)) | |||
| 145 | 145 | ||
| 146 | (ant | 146 | (ant |
| 147 | "^[ \t]*\\[[^] \n]+\\][ \t]*\\([^: \n]+\\):\\([0-9]+\\):\\(?:\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\):\\)?\ | 147 | "^[ \t]*\\[[^] \n]+\\][ \t]*\\([^: \n]+\\):\\([0-9]+\\):\\(?:\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\):\\)?\ |
| 148 | \\( warning\\)?" 1 (2 . 4) (3 . 5) (4)) | 148 | \\( warning\\)?" 1 (2 . 4) (3 . 5) (6)) |
| 149 | 149 | ||
| 150 | (bash | 150 | (bash |
| 151 | "^\\([^: \n\t]+\\): line \\([0-9]+\\):" 1 2) | 151 | "^\\([^: \n\t]+\\): line \\([0-9]+\\):" 1 2) |