HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CEDET (development tools) package merged.
[bpt/emacs.git]
/
lisp
/
emulation
/
viper-util.el
diff --git
a/lisp/emulation/viper-util.el
b/lisp/emulation/viper-util.el
index
9bb0471
..
1ee1aca
100644
(file)
--- a/
lisp/emulation/viper-util.el
+++ b/
lisp/emulation/viper-util.el
@@
-1,7
+1,7
@@
;;; viper-util.el --- Utilities used by viper.el
;; Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
;;; viper-util.el --- Utilities used by viper.el
;; Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; 2004, 2005, 2006, 2007, 2008
, 2009
Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
@@
-196,7
+196,7
@@
Otherwise return the normal value."
color)))))))
color)))))))
-(def
subst
viper-get-saved-cursor-color-in-replace-mode ()
+(def
un
viper-get-saved-cursor-color-in-replace-mode ()
(or
(funcall
(if (featurep 'emacs) 'frame-parameter 'frame-property)
(or
(funcall
(if (featurep 'emacs) 'frame-parameter 'frame-property)
@@
-206,7
+206,7
@@
Otherwise return the normal value."
(viper-frame-value viper-emacs-state-cursor-color))
(viper-frame-value viper-vi-state-cursor-color))))
(viper-frame-value viper-emacs-state-cursor-color))
(viper-frame-value viper-vi-state-cursor-color))))
-(def
subst
viper-get-saved-cursor-color-in-insert-mode ()
+(def
un
viper-get-saved-cursor-color-in-insert-mode ()
(or
(funcall
(if (featurep 'emacs) 'frame-parameter 'frame-property)
(or
(funcall
(if (featurep 'emacs) 'frame-parameter 'frame-property)
@@
-216,7
+216,7
@@
Otherwise return the normal value."
(viper-frame-value viper-emacs-state-cursor-color))
(viper-frame-value viper-vi-state-cursor-color))))
(viper-frame-value viper-emacs-state-cursor-color))
(viper-frame-value viper-vi-state-cursor-color))))
-(def
subst
viper-get-saved-cursor-color-in-emacs-mode ()
+(def
un
viper-get-saved-cursor-color-in-emacs-mode ()
(or
(funcall
(if (featurep 'emacs) 'frame-parameter 'frame-property)
(or
(funcall
(if (featurep 'emacs) 'frame-parameter 'frame-property)
@@
-939,10
+939,10
@@
Otherwise return the normal value."
event))
;; Uses different timeouts for ESC-sequences and others
event))
;; Uses different timeouts for ESC-sequences and others
-(def
subst
viper-fast-keysequence-p ()
+(def
un
viper-fast-keysequence-p ()
(not (viper-sit-for-short
(if (viper-ESC-event-p last-input-event)
(not (viper-sit-for-short
(if (viper-ESC-event-p last-input-event)
- viper-ESC-keyseq-timeout
+ (viper-ESC-keyseq-timeout)
viper-fast-keyseq-timeout)
t)))
viper-fast-keyseq-timeout)
t)))
@@
-1549,9
+1549,9
@@
This option is appropriate if you like Emacs-style words."
-;;
;
Local Variables:
-;;
;
eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
-;;
;
End:
+;; Local Variables:
+;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
+;; End:
;; arch-tag: 7f023fd5-dd9e-4378-a397-9c179553b0e3
;;; viper-util.el ends here
;; arch-tag: 7f023fd5-dd9e-4378-a397-9c179553b0e3
;;; viper-util.el ends here