comparison lisp/vc-bzr.el @ 106670:8437678ea169

(vc-bzr-log-view-mode): Fix short log regexp.
author Dan Nicolaescu <dann@ics.uci.edu>
date Mon, 28 Dec 2009 10:34:51 -0800
parents c43a4817b264
children f147ed43b1d5
comparison
equal deleted inserted replaced
106669:04cdd0140564 106670:8437678ea169
460 (require 'add-log) 460 (require 'add-log)
461 (set (make-local-variable 'log-view-per-file-logs) nil) 461 (set (make-local-variable 'log-view-per-file-logs) nil)
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
469 ;; value of log-view-message-re only since Emacs-23. 469 ;; value of log-view-message-re only since Emacs-23.
470 (if vc-short-log 470 (if vc-short-log