Mercurial > emacs
changeset 85169:708abc311fa6
Follow through on the VC terminology change (version -> revision).
| author | Eric S. Raymond <esr@snark.thyrsus.com> |
|---|---|
| date | Thu, 11 Oct 2007 16:02:53 +0000 |
| parents | 0860e426be99 |
| children | 000327e80fc2 |
| files | lisp/ediff-vers.el lisp/ldefs-boot.el lisp/vc-hooks.el |
| diffstat | 3 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ediff-vers.el Thu Oct 11 15:29:58 2007 +0000 +++ b/lisp/ediff-vers.el Thu Oct 11 16:02:53 2007 +0000 @@ -84,12 +84,12 @@ (setq rev1 (ediff-vc-latest-version (buffer-file-name)))) (save-window-excursion (save-excursion - (vc-version-other-window rev1) + (vc-revision-other-window rev1) (setq rev1buf (current-buffer) file1 (buffer-file-name))) (save-excursion (or (string= rev2 "") ; use current buffer - (vc-version-other-window rev2)) + (vc-revision-other-window rev2)) (setq rev2buf (current-buffer) file2 (buffer-file-name))) (setq startup-hooks @@ -191,17 +191,17 @@ (let (buf1 buf2 ancestor-buf) (save-window-excursion (save-excursion - (vc-version-other-window rev1) + (vc-revision-other-window rev1) (setq buf1 (current-buffer))) (save-excursion (or (string= rev2 "") - (vc-version-other-window rev2)) + (vc-revision-other-window rev2)) (setq buf2 (current-buffer))) (if ancestor-rev (save-excursion (if (string= ancestor-rev "") (setq ancestor-rev (vc-working-revision buffer-file-name))) - (vc-version-other-window ancestor-rev) + (vc-revision-other-window ancestor-rev) (setq ancestor-buf (current-buffer)))) (setq startup-hooks (cons
--- a/lisp/ldefs-boot.el Thu Oct 11 15:29:58 2007 +0000 +++ b/lisp/ldefs-boot.el Thu Oct 11 16:02:53 2007 +0000 @@ -29250,7 +29250,7 @@ ;;;### (autoloads (vc-annotate vc-update-change-log vc-rename-file ;;;;;; vc-transfer-file vc-switch-backend vc-rollback vc-update ;;;;;; vc-revert vc-print-log vc-retrieve-snapshot vc-create-snapshot -;;;;;; vc-directory vc-merge vc-insert-headers vc-version-other-window +;;;;;; vc-directory vc-merge vc-insert-headers vc-revision-other-window ;;;;;; vc-diff vc-register vc-next-action vc-do-command edit-vc-file ;;;;;; with-vc-file vc-branch-part vc-trunk-p vc-before-checkin-hook ;;;;;; vc-checkin-hook vc-checkout-hook) "vc" "vc.el" (18104 24741)) @@ -29384,7 +29384,7 @@ \(fn HISTORIC &optional NOT-URGENT)" t nil) -(autoload (quote vc-version-other-window) "vc" "\ +(autoload (quote vc-revision-other-window) "vc" "\ Visit version REV of the current file in another window. If the current file is named `F', the version is named `F.~REV~'. If `F.~REV~' already exists, use it instead of checking it out again.
--- a/lisp/vc-hooks.el Thu Oct 11 15:29:58 2007 +0000 +++ b/lisp/vc-hooks.el Thu Oct 11 16:02:53 2007 +0000 @@ -925,7 +925,7 @@ (define-key map "v" 'vc-next-action) (define-key map "+" 'vc-update) (define-key map "=" 'vc-diff) - (define-key map "~" 'vc-version-other-window) + (define-key map "~" 'vc-revision-other-window) map)) (fset 'vc-prefix-map vc-prefix-map) (define-key global-map "\C-xv" 'vc-prefix-map) @@ -942,8 +942,8 @@ (define-key map [separator1] '("----")) (define-key map [vc-annotate] '("Annotate" . vc-annotate)) (define-key map [vc-rename-file] '("Rename File" . vc-rename-file)) - (define-key map [vc-version-other-window] - '("Show Other Version" . vc-version-other-window)) + (define-key map [vc-revision-other-window] + '("Show Other Version" . vc-revision-other-window)) (define-key map [vc-diff] '("Compare with Base Version" . vc-diff)) (define-key map [vc-update-change-log] '("Update ChangeLog" . vc-update-change-log)) @@ -985,7 +985,7 @@ ;;(put 'vc-rename-file 'menu-enable 'vc-mode) ;;(put 'vc-annotate 'menu-enable '(eq (vc-buffer-backend) 'CVS)) -;;(put 'vc-version-other-window 'menu-enable 'vc-mode) +;;(put 'vc-revision-other-window 'menu-enable 'vc-mode) ;;(put 'vc-diff 'menu-enable 'vc-mode) ;;(put 'vc-update-change-log 'menu-enable ;; '(member (vc-buffer-backend) '(RCS CVS)))