diff options
| author | Eric S. Raymond | 2007-10-11 16:02:53 +0000 |
|---|---|---|
| committer | Eric S. Raymond | 2007-10-11 16:02:53 +0000 |
| commit | 0a0ca7f11fe17ee09259e07bed63e5c193997463 (patch) | |
| tree | 36ed37f8ea22e88ac4cd48c85febf143a34882ce /lisp | |
| parent | ebd0c5ba614d2079228fac0d731c57c12ed976f3 (diff) | |
| download | emacs-0a0ca7f11fe17ee09259e07bed63e5c193997463.tar.gz emacs-0a0ca7f11fe17ee09259e07bed63e5c193997463.zip | |
Follow through on the VC terminology change (version -> revision).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ediff-vers.el | 10 | ||||
| -rw-r--r-- | lisp/ldefs-boot.el | 4 | ||||
| -rw-r--r-- | lisp/vc-hooks.el | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el index 97232afce76..8480984b95c 100644 --- a/lisp/ediff-vers.el +++ b/lisp/ediff-vers.el | |||
| @@ -84,12 +84,12 @@ comparison or merge operations are being performed." | |||
| 84 | (setq rev1 (ediff-vc-latest-version (buffer-file-name)))) | 84 | (setq rev1 (ediff-vc-latest-version (buffer-file-name)))) |
| 85 | (save-window-excursion | 85 | (save-window-excursion |
| 86 | (save-excursion | 86 | (save-excursion |
| 87 | (vc-version-other-window rev1) | 87 | (vc-revision-other-window rev1) |
| 88 | (setq rev1buf (current-buffer) | 88 | (setq rev1buf (current-buffer) |
| 89 | file1 (buffer-file-name))) | 89 | file1 (buffer-file-name))) |
| 90 | (save-excursion | 90 | (save-excursion |
| 91 | (or (string= rev2 "") ; use current buffer | 91 | (or (string= rev2 "") ; use current buffer |
| 92 | (vc-version-other-window rev2)) | 92 | (vc-revision-other-window rev2)) |
| 93 | (setq rev2buf (current-buffer) | 93 | (setq rev2buf (current-buffer) |
| 94 | file2 (buffer-file-name))) | 94 | file2 (buffer-file-name))) |
| 95 | (setq startup-hooks | 95 | (setq startup-hooks |
| @@ -191,17 +191,17 @@ comparison or merge operations are being performed." | |||
| 191 | (let (buf1 buf2 ancestor-buf) | 191 | (let (buf1 buf2 ancestor-buf) |
| 192 | (save-window-excursion | 192 | (save-window-excursion |
| 193 | (save-excursion | 193 | (save-excursion |
| 194 | (vc-version-other-window rev1) | 194 | (vc-revision-other-window rev1) |
| 195 | (setq buf1 (current-buffer))) | 195 | (setq buf1 (current-buffer))) |
| 196 | (save-excursion | 196 | (save-excursion |
| 197 | (or (string= rev2 "") | 197 | (or (string= rev2 "") |
| 198 | (vc-version-other-window rev2)) | 198 | (vc-revision-other-window rev2)) |
| 199 | (setq buf2 (current-buffer))) | 199 | (setq buf2 (current-buffer))) |
| 200 | (if ancestor-rev | 200 | (if ancestor-rev |
| 201 | (save-excursion | 201 | (save-excursion |
| 202 | (if (string= ancestor-rev "") | 202 | (if (string= ancestor-rev "") |
| 203 | (setq ancestor-rev (vc-working-revision buffer-file-name))) | 203 | (setq ancestor-rev (vc-working-revision buffer-file-name))) |
| 204 | (vc-version-other-window ancestor-rev) | 204 | (vc-revision-other-window ancestor-rev) |
| 205 | (setq ancestor-buf (current-buffer)))) | 205 | (setq ancestor-buf (current-buffer)))) |
| 206 | (setq startup-hooks | 206 | (setq startup-hooks |
| 207 | (cons | 207 | (cons |
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 1bc969a4026..4a443629d38 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el | |||
| @@ -29250,7 +29250,7 @@ If FILE-NAME is non-nil, save the result to FILE-NAME. | |||
| 29250 | ;;;### (autoloads (vc-annotate vc-update-change-log vc-rename-file | 29250 | ;;;### (autoloads (vc-annotate vc-update-change-log vc-rename-file |
| 29251 | ;;;;;; vc-transfer-file vc-switch-backend vc-rollback vc-update | 29251 | ;;;;;; vc-transfer-file vc-switch-backend vc-rollback vc-update |
| 29252 | ;;;;;; vc-revert vc-print-log vc-retrieve-snapshot vc-create-snapshot | 29252 | ;;;;;; vc-revert vc-print-log vc-retrieve-snapshot vc-create-snapshot |
| 29253 | ;;;;;; vc-directory vc-merge vc-insert-headers vc-version-other-window | 29253 | ;;;;;; vc-directory vc-merge vc-insert-headers vc-revision-other-window |
| 29254 | ;;;;;; vc-diff vc-register vc-next-action vc-do-command edit-vc-file | 29254 | ;;;;;; vc-diff vc-register vc-next-action vc-do-command edit-vc-file |
| 29255 | ;;;;;; with-vc-file vc-branch-part vc-trunk-p vc-before-checkin-hook | 29255 | ;;;;;; with-vc-file vc-branch-part vc-trunk-p vc-before-checkin-hook |
| 29256 | ;;;;;; vc-checkin-hook vc-checkout-hook) "vc" "vc.el" (18104 24741)) | 29256 | ;;;;;; vc-checkin-hook vc-checkout-hook) "vc" "vc.el" (18104 24741)) |
| @@ -29384,7 +29384,7 @@ saving the buffer. | |||
| 29384 | 29384 | ||
| 29385 | \(fn HISTORIC &optional NOT-URGENT)" t nil) | 29385 | \(fn HISTORIC &optional NOT-URGENT)" t nil) |
| 29386 | 29386 | ||
| 29387 | (autoload (quote vc-version-other-window) "vc" "\ | 29387 | (autoload (quote vc-revision-other-window) "vc" "\ |
| 29388 | Visit version REV of the current file in another window. | 29388 | Visit version REV of the current file in another window. |
| 29389 | If the current file is named `F', the version is named `F.~REV~'. | 29389 | If the current file is named `F', the version is named `F.~REV~'. |
| 29390 | If `F.~REV~' already exists, use it instead of checking it out again. | 29390 | If `F.~REV~' already exists, use it instead of checking it out again. |
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index 64ce29ddaf4..92c6c734483 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el | |||
| @@ -925,7 +925,7 @@ Used in `find-file-not-found-functions'." | |||
| 925 | (define-key map "v" 'vc-next-action) | 925 | (define-key map "v" 'vc-next-action) |
| 926 | (define-key map "+" 'vc-update) | 926 | (define-key map "+" 'vc-update) |
| 927 | (define-key map "=" 'vc-diff) | 927 | (define-key map "=" 'vc-diff) |
| 928 | (define-key map "~" 'vc-version-other-window) | 928 | (define-key map "~" 'vc-revision-other-window) |
| 929 | map)) | 929 | map)) |
| 930 | (fset 'vc-prefix-map vc-prefix-map) | 930 | (fset 'vc-prefix-map vc-prefix-map) |
| 931 | (define-key global-map "\C-xv" 'vc-prefix-map) | 931 | (define-key global-map "\C-xv" 'vc-prefix-map) |
| @@ -942,8 +942,8 @@ Used in `find-file-not-found-functions'." | |||
| 942 | (define-key map [separator1] '("----")) | 942 | (define-key map [separator1] '("----")) |
| 943 | (define-key map [vc-annotate] '("Annotate" . vc-annotate)) | 943 | (define-key map [vc-annotate] '("Annotate" . vc-annotate)) |
| 944 | (define-key map [vc-rename-file] '("Rename File" . vc-rename-file)) | 944 | (define-key map [vc-rename-file] '("Rename File" . vc-rename-file)) |
| 945 | (define-key map [vc-version-other-window] | 945 | (define-key map [vc-revision-other-window] |
| 946 | '("Show Other Version" . vc-version-other-window)) | 946 | '("Show Other Version" . vc-revision-other-window)) |
| 947 | (define-key map [vc-diff] '("Compare with Base Version" . vc-diff)) | 947 | (define-key map [vc-diff] '("Compare with Base Version" . vc-diff)) |
| 948 | (define-key map [vc-update-change-log] | 948 | (define-key map [vc-update-change-log] |
| 949 | '("Update ChangeLog" . vc-update-change-log)) | 949 | '("Update ChangeLog" . vc-update-change-log)) |
| @@ -985,7 +985,7 @@ Used in `find-file-not-found-functions'." | |||
| 985 | 985 | ||
| 986 | ;;(put 'vc-rename-file 'menu-enable 'vc-mode) | 986 | ;;(put 'vc-rename-file 'menu-enable 'vc-mode) |
| 987 | ;;(put 'vc-annotate 'menu-enable '(eq (vc-buffer-backend) 'CVS)) | 987 | ;;(put 'vc-annotate 'menu-enable '(eq (vc-buffer-backend) 'CVS)) |
| 988 | ;;(put 'vc-version-other-window 'menu-enable 'vc-mode) | 988 | ;;(put 'vc-revision-other-window 'menu-enable 'vc-mode) |
| 989 | ;;(put 'vc-diff 'menu-enable 'vc-mode) | 989 | ;;(put 'vc-diff 'menu-enable 'vc-mode) |
| 990 | ;;(put 'vc-update-change-log 'menu-enable | 990 | ;;(put 'vc-update-change-log 'menu-enable |
| 991 | ;; '(member (vc-buffer-backend) '(RCS CVS))) | 991 | ;; '(member (vc-buffer-backend) '(RCS CVS))) |