diff options
| author | Dan Nicolaescu | 2009-12-28 10:34:51 -0800 |
|---|---|---|
| committer | Dan Nicolaescu | 2009-12-28 10:34:51 -0800 |
| commit | 2592ab767ade2ebb41b6734356b07d7f12c2fba6 (patch) | |
| tree | d77796511dcc07572581103da81dc231c1f15b1b | |
| parent | 6d96d18fcfacb795a970e6978354d76603f08ee3 (diff) | |
| download | emacs-2592ab767ade2ebb41b6734356b07d7f12c2fba6.tar.gz emacs-2592ab767ade2ebb41b6734356b07d7f12c2fba6.zip | |
(vc-bzr-log-view-mode): Fix short log regexp.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc-bzr.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8a493d7c106..d3e12317611 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2009-12-28 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * vc-bzr.el (vc-bzr-log-view-mode): Fix short log regexp. | ||
| 4 | |||
| 1 | 2009-12-28 Juanma Barranquero <lekktu@gmail.com> | 5 | 2009-12-28 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | Supersede color.diff settings in git log (bug#5211). | 7 | Supersede color.diff settings in git log (bug#5211). |
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index ae6117d1891..99b910e9f94 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el | |||
| @@ -462,7 +462,7 @@ REV non-nil gets an error." | |||
| 462 | (set (make-local-variable 'log-view-file-re) "\\`a\\`") | 462 | (set (make-local-variable 'log-view-file-re) "\\`a\\`") |
| 463 | (set (make-local-variable 'log-view-message-re) | 463 | (set (make-local-variable 'log-view-message-re) |
| 464 | (if vc-short-log | 464 | (if vc-short-log |
| 465 | "^ +\\([0-9.]+\\) \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)\\( \\[merge\\]\\)?" | 465 | "^ *\\([0-9.]+\\) \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)\\( \\[merge\\]\\)?" |
| 466 | "^ *\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)")) | 466 | "^ *\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)")) |
| 467 | (set (make-local-variable 'log-view-font-lock-keywords) | 467 | (set (make-local-variable 'log-view-font-lock-keywords) |
| 468 | ;; log-view-font-lock-keywords is careful to use the buffer-local | 468 | ;; log-view-font-lock-keywords is careful to use the buffer-local |