diff options
| author | Jason Rumney | 2007-08-05 21:46:00 +0000 |
|---|---|---|
| committer | Jason Rumney | 2007-08-05 21:46:00 +0000 |
| commit | a92b30a61ee2092c2edc43a4d8bc38fd1e265dc0 (patch) | |
| tree | 9e6ff8a3b01c53ca8f029f82cb29b4a6ffcf2b83 | |
| parent | 950ebc4566fd4f861e0bea5d3e82145e56340948 (diff) | |
| download | emacs-a92b30a61ee2092c2edc43a4d8bc38fd1e265dc0.tar.gz emacs-a92b30a61ee2092c2edc43a4d8bc38fd1e265dc0.zip | |
(vc-rollback): Add norevert argument back.
(vc-revert-buffer): Add back as obsolete alias.
| -rw-r--r-- | lisp/vc.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index 78e098d874f..2b2dd9fb8c9 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -2636,6 +2636,9 @@ changes found in the master file; use \\[universal-argument] \\[vc-next-action] | |||
| 2636 | (message "Reverting %s...done" file))) | 2636 | (message "Reverting %s...done" file))) |
| 2637 | 2637 | ||
| 2638 | ;;;###autoload | 2638 | ;;;###autoload |
| 2639 | (define-obsolete-function-alias 'vc-revert-buffer 'vc-revert "23.1") | ||
| 2640 | |||
| 2641 | ;;;###autoload | ||
| 2639 | (defun vc-update () | 2642 | (defun vc-update () |
| 2640 | "Update the current buffer's file to the latest version on its branch. | 2643 | "Update the current buffer's file to the latest version on its branch. |
| 2641 | If the file contains no changes, and is not locked, then this simply replaces | 2644 | If the file contains no changes, and is not locked, then this simply replaces |
| @@ -2718,8 +2721,9 @@ return its name; otherwise return nil." | |||
| 2718 | (vc-resynch-buffer file t t)) | 2721 | (vc-resynch-buffer file t t)) |
| 2719 | 2722 | ||
| 2720 | ;;;###autoload | 2723 | ;;;###autoload |
| 2721 | (defun vc-rollback () | 2724 | (defun vc-rollback (&optional norevert) |
| 2722 | "Get rid of most recently checked in version of this file." | 2725 | "Get rid of most recently checked in version of this file. |
| 2726 | A prefix argument NOREVERT means do not revert the buffer afterwards." | ||
| 2723 | (interactive "P") | 2727 | (interactive "P") |
| 2724 | (vc-ensure-vc-buffer) | 2728 | (vc-ensure-vc-buffer) |
| 2725 | (let* ((file buffer-file-name) | 2729 | (let* ((file buffer-file-name) |