summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2009-04-07 01:49:40 +0000
committerChong Yidong <cyd@stupidchicken.com>2009-04-07 01:49:40 +0000
commit71de5c37a1a3dd2191b36a6ec116a4baafcecaa3 (patch)
tree71afac34ecd588931d094a282f0aee166148eaed /lisp
parente762149473e52db3fbaa87cedbf095ab690fc53c (diff)
downloademacs-71de5c37a1a3dd2191b36a6ec116a4baafcecaa3.tar.gz
* vc-bzr.el (vc-bzr-log-view-mode): Tweak log-view-message-re (Bug#2872).
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/vc-bzr.el2
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c16ce2153d4..57bddc721d6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2009-04-07 Chong Yidong <cyd@stupidchicken.com>
+ * vc-bzr.el (vc-bzr-log-view-mode): Tweak
+ log-view-message-re (Bug#2872).
+
* descr-text.el (describe-property-list, describe-char): Add
follow-link properties to buttons that need them.
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index 72d683fd549..986812ae347 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)
- "^ *-+\n *\\(?: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.