diff options
| author | Stefan Monnier | 2010-06-15 00:51:42 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2010-06-15 00:51:42 -0400 |
| commit | 12755d08466fd26fcba7d9b9c7ed4f466f4ad2ca (patch) | |
| tree | 707087cd72184c8f5b8b29775298fee924b6b3bb | |
| parent | 95344a11bf9cc3a26985892bba37176dd0972a04 (diff) | |
| download | emacs-12755d08466fd26fcba7d9b9c7ed4f466f4ad2ca.tar.gz emacs-12755d08466fd26fcba7d9b9c7ed4f466f4ad2ca.zip | |
* lisp/vc-annotate.el (vc-annotate): Use vc-read-revision.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc-annotate.el | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f3aff53e1b3..6e8ba492710 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-06-15 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * vc-annotate.el (vc-annotate): Use vc-read-revision. | ||
| 4 | |||
| 1 | 2010-06-15 Glenn Morris <rgm@gnu.org> | 5 | 2010-06-15 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * calendar/appt.el (appt-time-msg-list): Doc fix. | 7 | * calendar/appt.el (appt-time-msg-list): Doc fix. |
diff --git a/lisp/vc-annotate.el b/lisp/vc-annotate.el index 71839443553..437081293cb 100644 --- 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." | |||
| 315 | 315 | ||
| 316 | ;;;###autoload | 316 | ;;;###autoload |
| 317 | (defun vc-annotate (file rev &optional display-mode buf move-point-to) | 317 | (defun vc-annotate (file rev &optional display-mode buf move-point-to) |
| 318 | "Display the edit history of the current file using colors. | 318 | "Display the edit history of the current FILE using colors. |
| 319 | 319 | ||
| 320 | This command creates a buffer that shows, for each line of the current | 320 | This command creates a buffer that shows, for each line of the current |
| 321 | file, when it was last edited and by whom. Additionally, colors are | 321 | 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; | |||
| 325 | everything that is older than that is shown in blue. | 325 | everything that is older than that is shown in blue. |
| 326 | 326 | ||
| 327 | With a prefix argument, this command asks two questions in the | 327 | With a prefix argument, this command asks two questions in the |
| 328 | minibuffer. First, you may enter a revision number; then the buffer | 328 | minibuffer. First, you may enter a revision number REV; then the buffer |
| 329 | displays and annotates that revision instead of the working revision | 329 | displays and annotates that revision instead of the working revision |
| 330 | \(type RET in the minibuffer to leave that default unchanged). Then, | 330 | \(type RET in the minibuffer to leave that default unchanged). Then, |
| 331 | you are prompted for the time span in days which the color range | 331 | 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 | |||
| 347 | (list buffer-file-name | 347 | (list buffer-file-name |
| 348 | (let ((def (vc-working-revision buffer-file-name))) | 348 | (let ((def (vc-working-revision buffer-file-name))) |
| 349 | (if (null current-prefix-arg) def | 349 | (if (null current-prefix-arg) def |
| 350 | (read-string | 350 | (vc-read-revision |
| 351 | (format "Annotate from revision (default %s): " def) | 351 | (format "Annotate from revision (default %s): " def) |
| 352 | nil nil def))) | 352 | (list buffer-file-name) nil def))) |
| 353 | (if (null current-prefix-arg) | 353 | (if (null current-prefix-arg) |
| 354 | vc-annotate-display-mode | 354 | vc-annotate-display-mode |
| 355 | (float (string-to-number | 355 | (float (string-to-number |