diff options
| author | Miles Bader <miles@gnu.org> | 2008-04-05 23:01:26 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-04-05 23:01:26 +0000 |
| commit | 5bc6ddff00c50acf546530ef0e08a27140614d27 (patch) | |
| tree | 22f92034de583fe3df108e166385e30220b426fe /lisp/vc-bzr.el | |
| parent | d8c852509f6218db43e5f2ca8baace02d4fa1294 (diff) | |
| parent | 37128b5497b54367b25ed149ead91821adc65876 (diff) | |
| download | emacs-5bc6ddff00c50acf546530ef0e08a27140614d27.tar.gz | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1107
Diffstat (limited to 'lisp/vc-bzr.el')
| -rw-r--r-- | lisp/vc-bzr.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index 47abf98c32a..ff17ee4e9bb 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -519,7 +519,7 @@ property containing author and date information." ;; 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]+\\) +\\(.+\\) +\\([0-9]\\{8\\}\\) |" + (while (re-search-forward "^\\( *[0-9.]+ *\\) \\([^\n ]+\\) +\\([0-9]\\{8\\}\\) |" nil t) (let* ((rev (match-string 1)) (author (match-string 2)) @@ -535,7 +535,7 @@ property containing author and date information." (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 @@ -550,7 +550,7 @@ property containing author and date information." 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) |