Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
d3fbe87e
Commit
d3fbe87e
authored
Jan 06, 2011
by
Stefan Monnier
Browse files
* vc-bzr.el (vc-bzr-annotate-command, vc-bzr-annotate-time):
Author names can have spaces. Fixes: debbugs:7792
parent
8434f239
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/vc-bzr.el
lisp/vc-bzr.el
+2
-2
No files found.
lisp/ChangeLog
View file @
d3fbe87e
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
...
...
lisp/vc-bzr.el
View file @
d3fbe87e
...
...
@@ -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)))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment