* lisp/vc-annotate.el (vc-annotate): Use vc-read-revision.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f3aff53e1b3cbbf0ef769af48568b6583c0f9adc..6e8ba4927101fa10993c2c47a84677660562e140 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * vc-annotate.el (vc-annotate): Use vc-read-revision.
+
 2010-06-15  Glenn Morris  <rgm@gnu.org>
 
        * calendar/appt.el (appt-time-msg-list): Doc fix.

diff --git a/lisp/vc-annotate.el b/lisp/vc-annotate.el
index 71839443553ce1b7a9bff2054847a639ac998f91..437081293cbaabde092060eb1ae60cca4456250c 100644 (file)
--- a/lisp/vc-annotate.el
+++ b/lisp/vc-annotate.el
@@ -315,7 +315,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
@@ -325,7 +325,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
@@ -347,9 +347,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