diff options
| author | Stefan Monnier <[email protected]> | 2008-03-18 20:52:17 +0000 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2008-03-18 20:52:17 +0000 |
| commit | 1690cfbfacd8c500cf5f77fe6d7670943a49c26a (patch) | |
| tree | e86852c7fd6c4d97002b98d03c7b3232fa68f5e7 /lisp/vc-bzr.el | |
| parent | aec1ef0729fecde2dc7c322d6bbd52858104d2b7 (diff) | |
(vc-bzr-log-view-mode, vc-bzr-annotate-command)
(vc-bzr-annotate-time, vc-bzr-annotate-extract-revision-at-line):
Revision numbers can include ".".
Diffstat (limited to 'lisp/vc-bzr.el')
| -rw-r--r-- | lisp/vc-bzr.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index 3f64247fc6..325b8e1c7f 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -357,7 +357,7 @@ EDITABLE is ignored." ;; 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 @@ 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]+ *\\) \\([^\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 @@ 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 @@ -467,7 +467,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) |