[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog progmodes/compile.el
From: |
Sam Steingold |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog progmodes/compile.el |
Date: |
Mon, 12 Oct 2009 21:04:19 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Sam Steingold <sds> 09/10/12 21:04:18
Modified files:
lisp : ChangeLog
lisp/progmodes : compile.el
Log message:
(compilation-mode-font-lock-keywords): Do not prepend "^ *" to
non-anchored patterns, like the perl one (bug#3928).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16412&r2=1.16413
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/compile.el?cvsroot=emacs&r1=1.498&r2=1.499
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16412
retrieving revision 1.16413
diff -u -b -r1.16412 -r1.16413
--- ChangeLog 12 Oct 2009 20:42:45 -0000 1.16412
+++ ChangeLog 12 Oct 2009 21:04:15 -0000 1.16413
@@ -1,7 +1,10 @@
2009-10-12 Sam Steingold <address@hidden>
* progmodes/compile.el (compilation-next-error-function): Fix the
- timestamps if the buffer has been visited before
+ timestamps if the buffer has been visited before.
+
+ (compilation-mode-font-lock-keywords): Do not prepend "^ *" to
+ non-anchored patterns, like the perl one (bug#3928).
2009-10-12 Glenn Morris <address@hidden>
Index: progmodes/compile.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/compile.el,v
retrieving revision 1.498
retrieving revision 1.499
diff -u -b -r1.498 -r1.499
--- progmodes/compile.el 12 Oct 2009 20:42:48 -0000 1.498
+++ progmodes/compile.el 12 Oct 2009 21:04:18 -0000 1.499
@@ -989,11 +989,10 @@
;; another solution is to modify (some?) regexps in
;; `compilation-error-regexp-alist'.
;; note that omake usage is not limited to ocaml and C (for stubs).
- (unless (string-match (concat "^" (regexp-quote "^ *")) pat)
- (setq pat (concat "^ *"
- (if (= ?^ (aref pat 0))
- (substring pat 1)
- pat))))
+ (when (and (= ?^ (aref pat 0)) ; anchored: starts with "^"
+ ;; but does not allow an arbitrary number of leading
spaces
+ (not (and (= ? (aref pat 1)) (= ?* (aref pat 1)))))
+ (setq pat (concat "^ *" (substring pat 1))))
(if (consp file) (setq fmt (cdr file) file (car file)))
(if (consp line) (setq end-line (cdr line) line (car line)))
(if (consp col) (setq end-col (cdr col) col (car col)))