diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-06-16 16:08:41 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-06-16 16:08:41 -0400 |
| commit | 2a64315a111fb4da67e9c40c9b69045c4f63d619 (patch) | |
| tree | 2e7ba99465f6eb5eae64361767af5bc5fff7aca4 /lisp/vc | |
| parent | 288cf4e907c0350eb24824016763bddd09df8ea8 (diff) | |
| parent | 36901266a8acb83880fefee50c93abb09f64533b (diff) | |
| download | emacs-2a64315a111fb4da67e9c40c9b69045c4f63d619.tar.gz emacs-2a64315a111fb4da67e9c40c9b69045c4f63d619.tar.bz2 emacs-2a64315a111fb4da67e9c40c9b69045c4f63d619.zip | |
Merge from emacs-23
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/vc-annotate.el | 8 | ||||
| -rw-r--r-- | lisp/vc/vc-svn.el | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el index d21d40d50f2..d0951bdd404 100644 --- a/lisp/vc/vc-annotate.el +++ b/lisp/vc/vc-annotate.el @@ -316,7 +316,7 @@ use; you may override this using the second optional arg MODE." ;;;###autoload (defun vc-annotate (file rev &optional display-mode buf move-point-to) - "Display the edit history of the current file using colors. + "Display the edit history of the current FILE using colors. This command creates a buffer that shows, for each line of the current file, when it was last edited and by whom. Additionally, colors are @@ -326,7 +326,7 @@ default, the time scale stretches back one year into the past; everything that is older than that is shown in blue. With a prefix argument, this command asks two questions in the -minibuffer. First, you may enter a revision number; then the buffer +minibuffer. First, you may enter a revision number REV; then the buffer displays and annotates that revision instead of the working revision \(type RET in the minibuffer to leave that default unchanged). Then, you are prompted for the time span in days which the color range @@ -348,9 +348,9 @@ mode-specific menu. `vc-annotate-color-map' and (list buffer-file-name (let ((def (vc-working-revision buffer-file-name))) (if (null current-prefix-arg) def - (read-string + (vc-read-revision (format "Annotate from revision (default %s): " def) - nil nil def))) + (list buffer-file-name) nil def))) (if (null current-prefix-arg) vc-annotate-display-mode (float (string-to-number diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index cd43d425af1..889a60c278e 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -170,7 +170,7 @@ want to force an empty list of arguments, use t." (?? . unregistered) ;; This is what vc-svn-parse-status does. (?~ . edited))) - (re (if remote "^\\(.\\)...... \\([ *]\\) +\\(?:[-0-9]+\\)? \\(.*\\)$" + (re (if remote "^\\(.\\)......? \\([ *]\\) +\\(?:[-0-9]+\\)? \\(.*\\)$" ;; Subexp 2 is a dummy in this case, so the numbers match. "^\\(.\\)....\\(.\\) \\(.*\\)$")) result) |