diff options
Diffstat (limited to 'lisp')
-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 c318b8744a9..cef0687f45c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2009-04-07 Chong Yidong <cyd@stupidchicken.com> + + * vc-bzr.el (vc-bzr-log-view-mode): Fix last fix. + 2009-04-07 Glenn Morris <rgm@gnu.org> * term/ns-win.el (ns-pop-up-frames): Make it a defcustom. diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index 986812ae347..cafca383891 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -454,7 +454,7 @@ REV non-nil gets an error." (set (make-local-variable 'log-view-per-file-logs) nil) (set (make-local-variable 'log-view-file-re) "^Working file:[ \t]+\\(.+\\)") (set (make-local-variable 'log-view-message-re) - "^\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)") + "^ *\\(?: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 ;; value of log-view-message-re only since Emacs-23. |