comparison lisp/emulation/viper.el @ 20343:4327dd36b71b

new version
author Michael Kifer <kifer@cs.stonybrook.edu>
date Tue, 25 Nov 1997 02:10:08 +0000
parents f44ff2c52fac
children f7e788ea680b
comparison
equal deleted inserted replaced
20342:3739e4f90a55 20343:4327dd36b71b
6 ;; Keywords: emulations 6 ;; Keywords: emulations
7 ;; Author: Michael Kifer <kifer@cs.sunysb.edu> 7 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
8 8
9 ;; Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. 9 ;; Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
10 10
11 (defconst viper-version "3.002 (Polyglot) of October 23, 1997" 11 (defconst viper-version "3.004 (Polyglot) of November 11, 1997"
12 "The current version of Viper") 12 "The current version of Viper")
13 13
14 ;; This file is part of GNU Emacs. 14 ;; This file is part of GNU Emacs.
15 15
16 ;; GNU Emacs is free software; you can redistribute it and/or modify 16 ;; GNU Emacs is free software; you can redistribute it and/or modify
529 (viper-standard-value 'scroll-step viper-saved-non-viper-variables) 529 (viper-standard-value 'scroll-step viper-saved-non-viper-variables)
530 mode-line-buffer-identification 530 mode-line-buffer-identification
531 (viper-standard-value 531 (viper-standard-value
532 'mode-line-buffer-identification viper-saved-non-viper-variables) 532 'mode-line-buffer-identification viper-saved-non-viper-variables)
533 global-mode-string 533 global-mode-string
534 (viper-standard-value 'global-mode-string viper-saved-non-viper-variables)) 534 (delq 'viper-mode-string global-mode-string))
535 535
536 (if viper-emacs-p 536 (if viper-emacs-p
537 (setq-default 537 (setq-default
538 mark-even-if-inactive 538 mark-even-if-inactive
539 (viper-standard-value 539 (viper-standard-value
573 (viper-delocalize-var 'viper-emacs-intercept-minor-mode) 573 (viper-delocalize-var 'viper-emacs-intercept-minor-mode)
574 (viper-delocalize-var 'viper-emacs-local-user-minor-mode) 574 (viper-delocalize-var 'viper-emacs-local-user-minor-mode)
575 (viper-delocalize-var 'viper-emacs-kbd-minor-mode) 575 (viper-delocalize-var 'viper-emacs-kbd-minor-mode)
576 (viper-delocalize-var 'viper-emacs-global-user-minor-mode) 576 (viper-delocalize-var 'viper-emacs-global-user-minor-mode)
577 (viper-delocalize-var 'viper-emacs-state-modifier-minor-mode) 577 (viper-delocalize-var 'viper-emacs-state-modifier-minor-mode)
578
579 (viper-delocalize-var 'viper-current-state)
580 (viper-delocalize-var 'viper-mode-string)
578 581
579 (setq-default viper-vi-minibuffer-minor-mode nil 582 (setq-default viper-vi-minibuffer-minor-mode nil
580 viper-insert-minibuffer-minor-mode nil 583 viper-insert-minibuffer-minor-mode nil
581 viper-vi-intercept-minor-mode nil 584 viper-vi-intercept-minor-mode nil
582 viper-insert-intercept-minor-mode nil 585 viper-insert-intercept-minor-mode nil
600 viper-emacs-intercept-minor-mode nil 603 viper-emacs-intercept-minor-mode nil
601 viper-emacs-local-user-minor-mode nil 604 viper-emacs-local-user-minor-mode nil
602 viper-emacs-kbd-minor-mode nil 605 viper-emacs-kbd-minor-mode nil
603 viper-emacs-global-user-minor-mode nil 606 viper-emacs-global-user-minor-mode nil
604 viper-emacs-state-modifier-minor-mode nil 607 viper-emacs-state-modifier-minor-mode nil
608
609 viper-current-state 'emacs-state
610 viper-mode-string viper-emacs-state-id
605 ) 611 )
606 612
607 ;; remove all hooks set by viper 613 ;; remove all hooks set by viper
608 (mapatoms 'viper-remove-hooks) 614 (mapatoms 'viper-remove-hooks)
609 (remove-hook 'comint-mode-hook 'viper-comint-mode-hook) 615 (remove-hook 'comint-mode-hook 'viper-comint-mode-hook)
1216 viper-emacs-intercept-map "\C-c\\" 'viper-escape-to-vi) 1222 viper-emacs-intercept-map "\C-c\\" 'viper-escape-to-vi)
1217 (define-key 1223 (define-key
1218 viper-insert-intercept-map "\C-c\\" 'viper-escape-to-vi) 1224 viper-insert-intercept-map "\C-c\\" 'viper-escape-to-vi)
1219 1225
1220 (if viper-mode 1226 (if viper-mode
1221 (progn 1227 (setq-default viper-emacs-intercept-minor-mode t
1222 (setq viper-emacs-intercept-minor-mode t 1228 viper-emacs-local-user-minor-mode t
1223 viper-emacs-local-user-minor-mode t 1229 viper-emacs-global-user-minor-mode t
1224 viper-emacs-global-user-minor-mode t 1230 viper-emacs-kbd-minor-mode t
1225 viper-emacs-kbd-minor-mode t 1231 viper-emacs-state-modifier-minor-mode t))
1226 viper-emacs-state-modifier-minor-mode t) 1232 (if (and viper-mode (eq viper-current-state 'emacs-state))
1227 (setq-default viper-emacs-intercept-minor-mode t 1233 (setq viper-emacs-intercept-minor-mode t
1228 viper-emacs-local-user-minor-mode t 1234 viper-emacs-local-user-minor-mode t
1229 viper-emacs-global-user-minor-mode t 1235 viper-emacs-global-user-minor-mode t
1230 viper-emacs-kbd-minor-mode t 1236 viper-emacs-kbd-minor-mode t
1231 viper-emacs-state-modifier-minor-mode t) 1237 viper-emacs-state-modifier-minor-mode t))
1232 ))
1233 1238
1234 1239
1235 (if (and viper-mode 1240 (if (and viper-mode
1236 (or viper-always 1241 (or viper-always
1237 (and (< viper-expert-level 5) (> viper-expert-level 0)))) 1242 (and (< viper-expert-level 5) (> viper-expert-level 0))))