aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-01-08 07:54:04 +0000
committerGlenn Morris2008-01-08 07:54:04 +0000
commit70b79a60116857edc09f2a08186ef39fade3d10a (patch)
tree22202b7fa3cec0a43fd9e454e4b51fd360f3e962
parent97ff09b34cd3b9ee4343637b4e5b21f8bd0685bf (diff)
downloademacs-70b79a60116857edc09f2a08186ef39fade3d10a.tar.gz
emacs-70b79a60116857edc09f2a08186ef39fade3d10a.zip
Kevin Ryde <user42 at zip.com.au>
(compilation-error-regexp-alist-alist): For perl, allow "during global destruction" at end.
-rw-r--r--etc/ChangeLog4
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/compile.el6
3 files changed, 14 insertions, 1 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index f5d77683c01..e07c6808b3d 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
12008-01-08 Kevin Ryde <user42@zip.com.au>
2
3 * compilation.txt (perl): Add a "during global destruction" sample.
4
12008-01-08 Glenn Morris <rgm@gnu.org> 52008-01-08 Glenn Morris <rgm@gnu.org>
2 6
3 * calccard.tex, cs-dired-ref.tex, cs-refcard.tex, cs-survival.tex: 7 * calccard.tex, cs-dired-ref.tex, cs-refcard.tex, cs-survival.tex:
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f375e101d6c..4e750cb14c0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-01-08 Kevin Ryde <user42@zip.com.au>
2
3 * progmodes/compile.el (compilation-error-regexp-alist-alist):
4 For perl, allow "during global destruction" at end.
5
12008-01-08 Glenn Morris <rgm@gnu.org> 62008-01-08 Glenn Morris <rgm@gnu.org>
2 7
3 * diff-mode.el (diff-end-of-hunk): Don't match empty lines in 8 * diff-mode.el (diff-end-of-hunk): Don't match empty lines in
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 89f01392978..1fd0074dd41 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -273,8 +273,12 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
273\\(?:,\\| in\\| of\\)? file \\(.*?\\):?$" 273\\(?:,\\| in\\| of\\)? file \\(.*?\\):?$"
274 3 1 2) 274 3 1 2)
275 275
276 ;; "during global destruction": This comes out under "use
277 ;; warnings" in recent perl when breaking circular references
278 ;; during program or thread exit.
276 (perl 279 (perl
277 " at \\([^ \n]+\\) line \\([0-9]+\\)\\(?:[,.]\\|$\\)" 1 2) 280 " at \\([^ \n]+\\) line \\([0-9]+\\)\\(?:[,.]\\|$\\| \
281during global destruction\\.$\\)" 1 2)
278 282
279 (rxp 283 (rxp
280 "^\\(?:Error\\|Warnin\\(g\\)\\):.*\n.* line \\([0-9]+\\) char\ 284 "^\\(?:Error\\|Warnin\\(g\\)\\):.*\n.* line \\([0-9]+\\) char\