Mercurial > emacs

comparison lisp/emulation/viper.el @ 91367:c70e45a7acfd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-324
author Miles Bader <miles@gnu.org>
date Wed, 30 Jan 2008 07:57:28 +0000
parents 606f2d163a64 ae3fe9150b36
children
comparison
equal deleted inserted replaced
91366:86f3a8f0a3a6 91367:c70e45a7acfd
7 ;; 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. 7 ;; 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
8 8
9 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> 9 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
10 ;; Keywords: emulations 10 ;; Keywords: emulations
11 11
12 (defconst viper-version "3.14 of August 18, 2007" 12 (defconst viper-version "3.14 of January 09, 2008"
13 "The current version of Viper") 13 "The current version of Viper")
14 14
15 ;; This file is part of GNU Emacs. 15 ;; This file is part of GNU Emacs.
16 16
17 ;; GNU Emacs is free software; you can redistribute it and/or modify 17 ;; GNU Emacs is free software; you can redistribute it and/or modify
855 (add-hook 'window-setup-hook 855 (add-hook 'window-setup-hook
856 '(lambda () 856 '(lambda ()
857 (modify-frame-parameters 857 (modify-frame-parameters
858 (selected-frame) 858 (selected-frame)
859 (list (cons 'viper-vi-state-cursor-color 859 (list (cons 'viper-vi-state-cursor-color
860 (viper-get-cursor-color)))))) 860 (viper-get-cursor-color))))
861 (setq viper-vi-state-cursor-color (viper-get-cursor-color))
862 ))
861 863
862 ;; Tell vc-diff to put *vc* in Vi mode 864 ;; Tell vc-diff to put *vc* in Vi mode
863 (if (featurep 'vc) 865 (if (featurep 'vc)
864 (defadvice vc-diff (after viper-vc-ad activate) 866 (defadvice vc-diff (after viper-vc-ad activate)
865 "Force Vi state in VC diff buffer." 867 "Force Vi state in VC diff buffer."
898 (defadvice set-cursor-color (after viper-set-cursor-color-ad activate) 900 (defadvice set-cursor-color (after viper-set-cursor-color-ad activate)
899 "Change cursor color in VI state." 901 "Change cursor color in VI state."
900 (modify-frame-parameters 902 (modify-frame-parameters
901 (selected-frame) 903 (selected-frame)
902 (list (cons 'viper-vi-state-cursor-color (ad-get-arg 0)))) 904 (list (cons 'viper-vi-state-cursor-color (ad-get-arg 0))))
905 (setq viper-vi-state-cursor-color (ad-get-arg 0))
903 ) 906 )
904 907
905 (when (and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists)) 908 (when (and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists))
906 ;; needs to be as early as possible 909 ;; needs to be as early as possible
907 (add-to-ordered-list 910 (add-to-ordered-list