summaryrefslogtreecommitdiff
path: root/lisp/emulation/viper-util.el
diff options
context:
space:
mode:
authorStefan Kangas <stefankangas@gmail.com>2020-08-16 21:40:28 +0200
committerStefan Kangas <stefankangas@gmail.com>2020-08-17 13:29:48 +0200
commitddbfbeb0671d13fdd06e6eca4328af02d922c6a5 (patch)
treee556c5427805245e148215e79435d0d576f8db41 /lisp/emulation/viper-util.el
parent2b6f52950dbc52f776e065a3716b8bd480d1b922 (diff)
downloademacs-ddbfbeb0671d13fdd06e6eca4328af02d922c6a5.tar.gz
Remove more XEmacs compat code from viper
* lisp/emulation/viper-util.el (viper-sit-for-short) (viper-last-command-char): Make obsolete. (viper-fast-keysequence-p): * lisp/emulation/viper-cmd.el (viper-escape-to-emacs) (viper-digit-argument, viper-command-argument, viper-undo) (viper-exit-minibuffer): * lisp/emulation/viper-mous.el (viper-multiclick-p): Adjust callers.
Diffstat (limited to 'lisp/emulation/viper-util.el')
-rw-r--r--lisp/emulation/viper-util.el13
1 files changed, 6 insertions, 7 deletions
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index 1561204151d..61bc26614eb 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -808,9 +808,8 @@ Otherwise return the normal value."
(define-obsolete-function-alias 'viper-abbreviate-file-name
'abbreviate-file-name "27.1")
-;; Sit for VAL milliseconds. XEmacs doesn't support the millisecond arg
-;; in sit-for, so this function smooths out the differences.
(defsubst viper-sit-for-short (val &optional nodisp)
+ (declare (obsolete nil "28.1"))
(sit-for (/ val 1000.0) nodisp))
;; EVENT may be a single event of a sequence of events
@@ -868,11 +867,10 @@ Otherwise return the normal value."
;; Uses different timeouts for ESC-sequences and others
(defun viper-fast-keysequence-p ()
- (not (viper-sit-for-short
- (if (viper-ESC-event-p last-input-event)
- (viper-ESC-keyseq-timeout)
- viper-fast-keyseq-timeout)
- t)))
+ (not (sit-for (/ (if (viper-ESC-event-p last-input-event)
+ (viper-ESC-keyseq-timeout)
+ viper-fast-keyseq-timeout) 1000.0)
+ t)))
(define-obsolete-function-alias 'viper-read-event-convert-to-char
'read-event "27.1")
@@ -920,6 +918,7 @@ Otherwise return the normal value."
basis)))
(defun viper-last-command-char ()
+ (declare (obsolete nil "28.1"))
last-command-event)
(defun viper-key-to-emacs-key (key)