aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2009-04-07 04:06:39 +0000
committerChong Yidong2009-04-07 04:06:39 +0000
commit4ffdb3072cd0162c548d681b18d9fde3f07d9dbc (patch)
tree29e114f691d9fc18f9f591cc087d37c6aaabab1b
parent73f6360c505778fa4ef8a3fbc24f9ef53cda40c6 (diff)
downloademacs-4ffdb3072cd0162c548d681b18d9fde3f07d9dbc.tar.gz
emacs-4ffdb3072cd0162c548d681b18d9fde3f07d9dbc.zip
* vc-bzr.el (vc-bzr-log-view-mode): Fix last fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc-bzr.el2
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 @@
12009-04-07 Chong Yidong <cyd@stupidchicken.com>
2
3 * vc-bzr.el (vc-bzr-log-view-mode): Fix last fix.
4
12009-04-07 Glenn Morris <rgm@gnu.org> 52009-04-07 Glenn Morris <rgm@gnu.org>
2 6
3 * term/ns-win.el (ns-pop-up-frames): Make it a defcustom. 7 * 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."
454 (set (make-local-variable 'log-view-per-file-logs) nil) 454 (set (make-local-variable 'log-view-per-file-logs) nil)
455 (set (make-local-variable 'log-view-file-re) "^Working file:[ \t]+\\(.+\\)") 455 (set (make-local-variable 'log-view-file-re) "^Working file:[ \t]+\\(.+\\)")
456 (set (make-local-variable 'log-view-message-re) 456 (set (make-local-variable 'log-view-message-re)
457 "^\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)") 457 "^ *\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)")
458 (set (make-local-variable 'log-view-font-lock-keywords) 458 (set (make-local-variable 'log-view-font-lock-keywords)
459 ;; log-view-font-lock-keywords is careful to use the buffer-local 459 ;; log-view-font-lock-keywords is careful to use the buffer-local
460 ;; value of log-view-message-re only since Emacs-23. 460 ;; value of log-view-message-re only since Emacs-23.