From: Stefan Monnier Date: Thu, 6 Jan 2011 16:03:59 +0000 (-0500) Subject: * vc-bzr.el (vc-bzr-annotate-command, vc-bzr-annotate-time): X-Git-Tag: emacs-pretest-23.2.92~6^2~14 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d3fbe87ed2eb5f34a8ce378f8f5d43a312cd77b3;p=emacs.git * vc-bzr.el (vc-bzr-annotate-command, vc-bzr-annotate-time): Author names can have spaces. Fixes: debbugs:7792 --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4f0a789ae33..8b72e41e9ad 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-01-06 Stefan Monnier + + * vc-bzr.el (vc-bzr-annotate-command, vc-bzr-annotate-time): + Author names can have spaces (bug#7792). + 2011-01-04 Kenichi Handa * mail/rmailmm.el (rmail-mime-insert-bulk): Display an unknown diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index a4b7d28cf87..41c9663fc77 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -605,7 +605,7 @@ property containing author and date information." (when (process-buffer proc) (with-current-buffer (process-buffer proc) (setq string (concat (process-get proc :vc-left-over) string)) - (while (string-match "^\\( *[0-9.]+ *\\) \\([^\n ]+\\) +\\([0-9]\\{8\\}\\)\\( |.*\n\\)" string) + (while (string-match "^\\( *[0-9.]+ *\\) \\(.+?\\) +\\([0-9]\\{8\\}\\)\\( |.*\n\\)" string) (let* ((rev (match-string 1 string)) (author (match-string 2 string)) (date (match-string 3 string)) @@ -632,7 +632,7 @@ property containing author and date information." (declare-function vc-annotate-convert-time "vc-annotate" (time)) (defun vc-bzr-annotate-time () - (when (re-search-forward "^ *[0-9.]+ +[^\n ]* +|" 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) (let ((str (match-string-no-properties 0 prop)))