From: Glenn Morris Date: Sat, 14 May 2011 23:58:25 +0000 (-0700) Subject: add-log font-lock fix for mutilple authors (bug#8644) X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~263 X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/375cb676c1539a2a1c690ca3471f476d2614694d add-log font-lock fix for mutilple authors (bug#8644) * lisp/vc/add-log.el (change-log-font-lock-keywords): Also handle multiple author lines with leading tabs. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fd1af4255c..4fd54d56b1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -2,6 +2,8 @@ * vc/add-log.el (add-change-log-entry): Don't start adding a new entry in the middle of an existing one with multiple authors. (Bug#8645) + (change-log-font-lock-keywords): Also handle multiple author lines + with leading tabs. (Bug#8644) * calendar/appt.el (appt-check): Rename some local variables. Some simplification/reordering. diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el index aecb0cd9ef..3149764d33 100644 --- a/lisp/vc/add-log.el +++ b/lisp/vc/add-log.el @@ -241,7 +241,7 @@ Note: The search is conducted only within 10%, at the beginning of the file." ;; wrongly with a non-date line existing as a random note. In ;; addition, using any kind of fixed setting like this doesn't ;; work if a user customizes add-log-time-format. - ("^[0-9-]+ +\\|^ \\{11,\\}\\|^\\(Sun\\|Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\) [A-z][a-z][a-z] [0-9:+ ]+" + ("^[0-9-]+ +\\|^ \\{11,\\}\\|^\t \\{3,\\}\\|^\\(Sun\\|Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\) [A-z][a-z][a-z] [0-9:+ ]+" (0 'change-log-date-face) ;; Name and e-mail; some people put e-mail in parens, not angles. ("\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" nil nil