[Emacs-diffs] emacs/lisp ChangeLog vc-bzr.el

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/12/09 06:04:12

Modified files:
        lisp           : ChangeLog vc-bzr.el 

Log message:
        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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16874&r2=1.16875
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-bzr.el?cvsroot=emacs&r1=1.93&r2=1.94

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16874
retrieving revision 1.16875
diff -u -b -r1.16874 -r1.16875
--- ChangeLog   9 Dec 2009 05:56:53 -0000       1.16874
+++ ChangeLog   9 Dec 2009 06:04:09 -0000       1.16875
@@ -1,3 +1,9 @@
+2009-12-09  Dan Nicolaescu  <address@hidden>
+
+       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.
+
 2009-12-09  Vivek Dasmohapatra  <address@hidden>
 
        Drop some properties to avoid surprises.

Index: vc-bzr.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-bzr.el,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- vc-bzr.el   7 Dec 2009 16:18:45 -0000       1.93
+++ vc-bzr.el   9 Dec 2009 06:04:12 -0000       1.94
@@ -462,7 +462,7 @@
   (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 @@
                    (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: \