Mercurial > emacs
comparison lisp/vc-bzr.el @ 106506:c43a4817b264
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.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Wed, 09 Dec 2009 06:04:09 +0000 |
| parents | 97d377672952 |
| children | 8437678ea169 |
comparison
equal
deleted
inserted
replaced
| 106505:7287842d7e07 | 106506:c43a4817b264 |
|---|---|
| 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 |
| 471 (append `((,log-view-message-re | 471 (append `((,log-view-message-re |
| 472 (1 'log-view-message-face) | 472 (1 'log-view-message-face) |
| 473 (2 'change-log-name) | 473 (2 'change-log-name) |
| 474 (3 'change-log-date) | 474 (3 'change-log-date) |
| 475 (4 'change-log-list)))) | 475 (4 'change-log-list nil lax)))) |
| 476 (append `((,log-view-message-re . 'log-view-message-face)) | 476 (append `((,log-view-message-re . 'log-view-message-face)) |
| 477 ;; log-view-font-lock-keywords | 477 ;; log-view-font-lock-keywords |
| 478 '(("^ *committer: \ | 478 '(("^ *committer: \ |
| 479 \\([^<(]+?\\)[ ]*[(<]\\([[:alnum:]_.+-]+@[[:alnum:]_.-]+\\)[>)]" | 479 \\([^<(]+?\\)[ ]*[(<]\\([[:alnum:]_.+-]+@[[:alnum:]_.-]+\\)[>)]" |
| 480 (1 'change-log-name) | 480 (1 'change-log-name) |