[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100360: * vc-bzr.el (vc-bzr-annotate-command, vc-bzr-annotate-time):

[Stefan Monnier]

------------------------------------------------------------
revno: 100360
committer: Stefan Monnier <address@hidden>
branch nick: emacs-23
timestamp: Thu 2011-01-06 11:03:59 -0500
message:
  * vc-bzr.el (vc-bzr-annotate-command, vc-bzr-annotate-time):
  Author names can have spaces.
modified:
  lisp/ChangeLog
  lisp/vc-bzr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-04 07:09:46 +0000
+++ b/lisp/ChangeLog    2011-01-06 16:03:59 +0000
@@ -1,3 +1,8 @@
+2011-01-06  Stefan Monnier  <address@hidden>
+
+       * vc-bzr.el (vc-bzr-annotate-command, vc-bzr-annotate-time):
+       Author names can have spaces (bug#7792).
+
 2011-01-04  Kenichi Handa  <address@hidden>
 
        * mail/rmailmm.el (rmail-mime-insert-bulk): Display an unknown

=== modified file 'lisp/vc-bzr.el'
--- a/lisp/vc-bzr.el    2011-01-02 23:50:46 +0000
+++ b/lisp/vc-bzr.el    2011-01-06 16:03:59 +0000
@@ -605,7 +605,7 @@
        (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 @@
 (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)))