diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2009-12-09 06:04:09 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2009-12-09 06:04:09 +0000 |
| commit | 99999a1d72bd57f7e902a66564599beb57b56011 (patch) | |
| tree | cce1f4f4ee09e2a39daea69566de07815e656b3a /lisp/vc-bzr.el | |
| parent | 2ea1c4aa5eb1b462a8c653d10d3205b8b428a95e (diff) | |
| download | emacs-99999a1d72bd57f7e902a66564599beb57b56011.tar.gz emacs-99999a1d72bd57f7e902a66564599beb57b56011.tar.bz2 emacs-99999a1d72bd57f7e902a66564599beb57b56011.zip | |
Fix short log parsing and fontification.
* vc-bzr.el (vc-bzr-log-view-mode): Match dot in revision number.
Fix fontification for the [merge] label.
Diffstat (limited to 'lisp/vc-bzr.el')
| -rw-r--r-- | lisp/vc-bzr.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index 13a3eb12b16..ae6117d1891 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -462,7 +462,7 @@ REV non-nil gets an error." (set (make-local-variable 'log-view-file-re) "\\`a\\`") (set (make-local-variable 'log-view-message-re) (if vc-short-log - "^ +\\([0-9]+\\) \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)\\( \\[merge\\]\\)?" + "^ +\\([0-9.]+\\) \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)\\( \\[merge\\]\\)?" "^ *\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)")) (set (make-local-variable 'log-view-font-lock-keywords) ;; log-view-font-lock-keywords is careful to use the buffer-local @@ -472,7 +472,7 @@ REV non-nil gets an error." (1 'log-view-message-face) (2 'change-log-name) (3 'change-log-date) - (4 'change-log-list)))) + (4 'change-log-list nil lax)))) (append `((,log-view-message-re . 'log-view-message-face)) ;; log-view-font-lock-keywords '(("^ *committer: \ |