diff options
| author | Glenn Morris | 2011-05-14 16:58:25 -0700 |
|---|---|---|
| committer | Glenn Morris | 2011-05-14 16:58:25 -0700 |
| commit | 375cb676c1539a2a1c690ca3471f476d2614694d (patch) | |
| tree | 4a8c938635bc64b94c766286658a3f6ddb0a33f8 | |
| parent | 7210a7391fe7b02cf27e55a90af5b828d7558384 (diff) | |
| download | emacs-375cb676c1539a2a1c690ca3471f476d2614694d.tar.gz emacs-375cb676c1539a2a1c690ca3471f476d2614694d.zip | |
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.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/vc/add-log.el | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fd1af4255cd..4fd54d56b19 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -2,6 +2,8 @@ | |||
| 2 | 2 | ||
| 3 | * vc/add-log.el (add-change-log-entry): Don't start adding a new entry | 3 | * vc/add-log.el (add-change-log-entry): Don't start adding a new entry |
| 4 | in the middle of an existing one with multiple authors. (Bug#8645) | 4 | in the middle of an existing one with multiple authors. (Bug#8645) |
| 5 | (change-log-font-lock-keywords): Also handle multiple author lines | ||
| 6 | with leading tabs. (Bug#8644) | ||
| 5 | 7 | ||
| 6 | * calendar/appt.el (appt-check): Rename some local variables. | 8 | * calendar/appt.el (appt-check): Rename some local variables. |
| 7 | Some simplification/reordering. | 9 | Some simplification/reordering. |
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el index aecb0cd9ef6..3149764d331 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." | |||
| 241 | ;; wrongly with a non-date line existing as a random note. In | 241 | ;; wrongly with a non-date line existing as a random note. In |
| 242 | ;; addition, using any kind of fixed setting like this doesn't | 242 | ;; addition, using any kind of fixed setting like this doesn't |
| 243 | ;; work if a user customizes add-log-time-format. | 243 | ;; work if a user customizes add-log-time-format. |
| 244 | ("^[0-9-]+ +\\|^ \\{11,\\}\\|^\\(Sun\\|Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\) [A-z][a-z][a-z] [0-9:+ ]+" | 244 | ("^[0-9-]+ +\\|^ \\{11,\\}\\|^\t \\{3,\\}\\|^\\(Sun\\|Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\) [A-z][a-z][a-z] [0-9:+ ]+" |
| 245 | (0 'change-log-date-face) | 245 | (0 'change-log-date-face) |
| 246 | ;; Name and e-mail; some people put e-mail in parens, not angles. | 246 | ;; Name and e-mail; some people put e-mail in parens, not angles. |
| 247 | ("\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" nil nil | 247 | ("\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" nil nil |