[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v [EMACS_22_BASE]
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v [EMACS_22_BASE] |
Date: |
Tue, 18 Mar 2008 20:52:20 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Branch: EMACS_22_BASE
Changes by: Stefan Monnier <monnier> 08/03/18 20:52:17
Index: vc-bzr.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-bzr.el,v
retrieving revision 1.11.2.12
retrieving revision 1.11.2.13
diff -u -b -r1.11.2.12 -r1.11.2.13
--- vc-bzr.el 14 Mar 2008 19:38:46 -0000 1.11.2.12
+++ vc-bzr.el 18 Mar 2008 20:52:17 -0000 1.11.2.13
@@ -357,7 +357,7 @@
;; Don't have file markers, so use impossible regexp.
(set (make-local-variable 'log-view-file-re) "\\'\\`")
(set (make-local-variable 'log-view-message-re)
- "^ *-+\n *\\(?:revno: \\([0-9]+\\)\\|merged: .+\\)")
+ "^ *-+\n *\\(?: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.
@@ -436,7 +436,7 @@
;; to allow saving space by sharing the text properties.
(setq vc-bzr-annotation-table (make-hash-table :test 'equal))
(goto-char (point-min))
- (while (re-search-forward "^\\( *[0-9]+ *\\) \\([^\n ]+\\)
+\\([0-9]\\{8\\}\\) |"
+ (while (re-search-forward "^\\( *[0-9.]+ *\\) \\([^\n ]+\\)
+\\([0-9]\\{8\\}\\) |"
nil t)
(let* ((rev (match-string 1))
(author (match-string 2))
@@ -452,7 +452,7 @@
(insert tag " |")))))
(defun vc-bzr-annotate-time ()
- (when (re-search-forward "^ *[0-9]+ +|" nil t)
+ (when (re-search-forward "^ *[0-9.]+ +|" nil t)
(let ((prop (get-text-property (line-beginning-position) 'help-echo)))
(string-match "[0-9]+\\'" prop)
(vc-annotate-convert-time
@@ -467,7 +467,7 @@
Return nil if current line isn't annotated."
(save-excursion
(beginning-of-line)
- (if (looking-at " *\\([0-9]+\\) | ")
+ (if (looking-at " *\\([0-9.]+\\) | ")
(match-string-no-properties 1))))
(defun vc-bzr-command-discarding-stderr (command &rest args)