(ctl-x-map): Don't bind C-x C-i or C-x 3.

(global-map): Don't bind C-z.
(vip-setup): New function to rebind C-x 7 and C-z.

diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el
index 15d592508362958e281253defe5f11408245992a..80e941d2ed614e59dbbf4544ecd6e201fe0a0021 100644 (file)
--- a/lisp/emulation/vip.el
+++ b/lisp/emulation/vip.el
@@ -293,9 +293,6 @@ If nil then it is bound to `delete-backward-char'."
 (define-key vip-mode-map "~" 'vip-nil)
 (define-key vip-mode-map "\177" 'vip-delete-backward-char)
 
-(define-key ctl-x-map "3" 'vip-buffer-in-two-windows)
-(define-key ctl-x-map "\C-i" 'insert-file)
-
 (defun vip-version ()
   (interactive)
   (message "VIP version 3.5 of September 15, 1987"))
@@ -303,7 +300,11 @@ If nil then it is bound to `delete-backward-char'."
 \f
 ;; basic set up
 
-(global-set-key "\C-z" 'vip-change-mode-to-vi)
+;;;###autoload
+(defun vip-setup ()
+  "Set up bindings for C-x 7 and C-z that are useful for VIP users."
+  (define-key ctl-x-map "7" 'vip-buffer-in-two-windows)
+  (global-set-key "\C-z" 'vip-change-mode-to-vi))
 
 (defmacro vip-loop (count body)
   "(COUNT BODY) Execute BODY COUNT times."