Bind VC keys only if VC is loaded.

diff --git a/v7/src/edwin/modefs.scm b/v7/src/edwin/modefs.scm
index f93372dd02ac42d56c1abf93a8f40c8461d89951..2d7d7c45132330c78809a2a296abb1c0eec7be8f 100644 (file)
--- a/v7/src/edwin/modefs.scm
+++ b/v7/src/edwin/modefs.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: modefs.scm,v 1.159 2000/06/11 04:24:36 cph Exp $
+;;; $Id: modefs.scm,v 1.160 2000/09/11 17:35:54 cph Exp $
 ;;;
 ;;; Copyright (c) 1985, 1989-2000 Massachusetts Institute of Technology
 ;;;
@@ -248,7 +248,7 @@ Like Fundamental mode, but no self-inserting characters.")
 (define-key 'fundamental '(#\c-x #\c-n) 'set-goal-column)
 (define-key 'fundamental '(#\c-x #\c-o) 'delete-blank-lines)
 (define-key 'fundamental '(#\c-x #\c-p) 'mark-page)
-(define-key 'fundamental '(#\c-x #\c-q) 'vc-toggle-read-only)
+(define-key 'fundamental '(#\c-x #\c-q) 'toggle-read-only)
 (define-key 'fundamental '(#\c-x #\c-s) 'save-buffer)
 (define-key 'fundamental '(#\c-x #\c-t) 'transpose-lines)
 (define-key 'fundamental '(#\c-x #\c-u) 'upcase-region)
@@ -318,21 +318,6 @@ Like Fundamental mode, but no self-inserting characters.")
 (define-key 'fundamental '(#\c-x #\r) 'copy-rectangle-to-register)
 (define-key 'fundamental '(#\c-x #\s) 'save-some-buffers)
 (define-key 'fundamental '(#\c-x #\u) 'undo)
-(define-prefix-key 'fundamental '(#\c-x #\v))
-;;(define-key 'fundamental '(#\c-x #\v #\a) 'vc-update-change-log)
-;;(define-key 'fundamental '(#\c-x #\v #\c) 'vc-cancel-version)
-(define-key 'fundamental '(#\c-x #\v #\d) 'vc-directory)
-;;(define-key 'fundamental '(#\c-x #\v #\g) 'vc-annotate)
-(define-key 'fundamental '(#\c-x #\v #\h) 'vc-insert-headers)
-(define-key 'fundamental '(#\c-x #\v #\i) 'vc-register)
-(define-key 'fundamental '(#\c-x #\v #\l) 'vc-print-log)
-;;(define-key 'fundamental '(#\c-x #\v #\m) 'vc-merge)
-;;(define-key 'fundamental '(#\c-x #\v #\r) 'vc-retrieve-snapshot)
-;;(define-key 'fundamental '(#\c-x #\v #\s) 'vc-create-snapshot)
-(define-key 'fundamental '(#\c-x #\v #\u) 'vc-revert-buffer)
-(define-key 'fundamental '(#\c-x #\v #\v) 'vc-next-action)
-(define-key 'fundamental '(#\c-x #\v #\=) 'vc-diff)
-(define-key 'fundamental '(#\c-x #\v #\~) 'vc-version-other-window)
 (define-key 'fundamental '(#\c-x #\w) 'widen)
 (define-key 'fundamental '(#\c-x #\x) 'copy-to-register)
 (define-key 'fundamental '(#\c-x #\z) 'suspend-edwin)
@@ -386,4 +371,25 @@ Like Fundamental mode, but no self-inserting characters.")
 (define-key 'fundamental button2-up 'mouse-ignore)
 (define-key 'fundamental button3-up 'mouse-ignore)
 (define-key 'fundamental button4-up 'mouse-ignore)
-(define-key 'fundamental button5-up 'mouse-ignore)
\ No newline at end of file
+(define-key 'fundamental button5-up 'mouse-ignore)
+
+;; Bind VC keys only if VC is loaded.
+(if (name->command 'vc-toggle-read-only #f)
+    (begin
+      (define-key 'fundamental '(#\c-x #\c-q) 'vc-toggle-read-only)
+      (define-prefix-key 'fundamental '(#\c-x #\v))
+      ;;(define-key 'fundamental '(#\c-x #\v #\a) 'vc-update-change-log)
+      ;;(define-key 'fundamental '(#\c-x #\v #\c) 'vc-cancel-version)
+      (define-key 'fundamental '(#\c-x #\v #\d) 'vc-directory)
+      ;;(define-key 'fundamental '(#\c-x #\v #\g) 'vc-annotate)
+      (define-key 'fundamental '(#\c-x #\v #\h) 'vc-insert-headers)
+      (define-key 'fundamental '(#\c-x #\v #\i) 'vc-register)
+      (define-key 'fundamental '(#\c-x #\v #\l) 'vc-print-log)
+      ;;(define-key 'fundamental '(#\c-x #\v #\m) 'vc-merge)
+      ;;(define-key 'fundamental '(#\c-x #\v #\r) 'vc-retrieve-snapshot)
+      ;;(define-key 'fundamental '(#\c-x #\v #\s) 'vc-create-snapshot)
+      (define-key 'fundamental '(#\c-x #\v #\u) 'vc-revert-buffer)
+      (define-key 'fundamental '(#\c-x #\v #\v) 'vc-next-action)
+      (define-key 'fundamental '(#\c-x #\v #\=) 'vc-diff)
+      (define-key 'fundamental '(#\c-x #\v #\~) 'vc-version-other-window)
+      ))
\ No newline at end of file