Mercurial > emacs
changeset 112242:6de29881faa6
* vc-bzr.el (vc-bzr-annotate-command, vc-bzr-annotate-time):
Author names can have spaces.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 06 Jan 2011 11:03:59 -0500 |
| parents | 98276eb8b0ed |
| children | 8c06638b3497 |
| files | lisp/ChangeLog lisp/vc-bzr.el |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Jan 04 16:10:30 2011 +0900 +++ b/lisp/ChangeLog Thu Jan 06 11:03:59 2011 -0500 @@ -1,3 +1,8 @@ +2011-01-06 Stefan Monnier <monnier@iro.umontreal.ca> + + * vc-bzr.el (vc-bzr-annotate-command, vc-bzr-annotate-time): + Author names can have spaces (bug#7792). + 2011-01-04 Kenichi Handa <handa@m17n.org> * mail/rmailmm.el (rmail-mime-insert-bulk): Display an unknown
--- a/lisp/vc-bzr.el Tue Jan 04 16:10:30 2011 +0900 +++ b/lisp/vc-bzr.el Thu Jan 06 11:03:59 2011 -0500 @@ -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)))