aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2010-05-21 03:46:38 +0200
committerJuanma Barranquero2010-05-21 03:46:38 +0200
commitbf1e8d4a0262967dde7a371885d76c92482c4f28 (patch)
tree5972a4a5f5dc3302bbe898d83e2b87cbf405e71d
parent208ca65b6160096dff7558906f28afec526782a9 (diff)
downloademacs-bf1e8d4a0262967dde7a371885d76c92482c4f28.tar.gz
emacs-bf1e8d4a0262967dde7a371885d76c92482c4f28.zip
* add-log.el: Highlight all authors in multi-author ChangeLog entries.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/add-log.el2
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a39380087c5..2508baa40f9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12010-05-21 Juanma Barranquero <lekktu@gmail.com> 12010-05-21 Juanma Barranquero <lekktu@gmail.com>
2 2
3 * add-log.el (change-log-font-lock-keywords):
4 Highlight all authors in multi-author entries.
5
3 * smerge-mode.el (smerge-refine-ignore-whitespace) 6 * smerge-mode.el (smerge-refine-ignore-whitespace)
4 (smerge-refine-weight-hack, smerge-refine, smerge-makeup-conflict): 7 (smerge-refine-weight-hack, smerge-refine, smerge-makeup-conflict):
5 Fix typos in docstrings. 8 Fix typos in docstrings.
diff --git a/lisp/add-log.el b/lisp/add-log.el
index ab99f6787c8..88277e66640 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -245,7 +245,7 @@ Note: The search is conducted only within 10%, at the beginning of the file."
245 ;; wrongly with a non-date line existing as a random note. In 245 ;; wrongly with a non-date line existing as a random note. In
246 ;; addition, using any kind of fixed setting like this doesn't 246 ;; addition, using any kind of fixed setting like this doesn't
247 ;; work if a user customizes add-log-time-format. 247 ;; work if a user customizes add-log-time-format.
248 ("^[0-9-]+ +\\|^\\(Sun\\|Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\) [A-z][a-z][a-z] [0-9:+ ]+" 248 ("^[0-9-]+ +\\|^ \\{11,\\}\\|^\\(Sun\\|Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\) [A-z][a-z][a-z] [0-9:+ ]+"
249 (0 'change-log-date-face) 249 (0 'change-log-date-face)
250 ;; Name and e-mail; some people put e-mail in parens, not angles. 250 ;; Name and e-mail; some people put e-mail in parens, not angles.
251 ("\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" nil nil 251 ("\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" nil nil