diff options
Diffstat (limited to 'lisp/emulation')
| -rw-r--r-- | lisp/emulation/cua-base.el | 2 | ||||
| -rw-r--r-- | lisp/emulation/edt.el | 4 | ||||
| -rw-r--r-- | lisp/emulation/viper-init.el | 2 | ||||
| -rw-r--r-- | lisp/emulation/viper-mous.el | 50 | ||||
| -rw-r--r-- | lisp/emulation/viper-util.el | 1 | ||||
| -rw-r--r-- | lisp/emulation/viper.el | 1 |
6 files changed, 12 insertions, 48 deletions
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index 26a1a8955f4..c4dcb76446e 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -860,7 +860,7 @@ With numeric prefix arg, copy to register 0-9 instead." (defun cua-cancel () "Cancel the active region, rectangle, or global mark." (interactive) - (setq mark-active nil) + (deactivate-mark) (if (fboundp 'cua--cancel-rectangle) (cua--cancel-rectangle))) diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el index 8dc18ebc85e..e70b44658d5 100644 --- a/lisp/emulation/edt.el +++ b/lisp/emulation/edt.el @@ -178,10 +178,8 @@ (defvar edt-user-global-map) (defvar rect-start-point) -;;; -;;; Version Information -;;; (defconst edt-version "4.0" "EDT Emulation version number.") +(make-obsolete-variable 'edt-version nil "28.1") ;;; ;;; User Configurable Variables diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el index 511c68f24a7..6c4afe519f2 100644 --- a/lisp/emulation/viper-init.el +++ b/lisp/emulation/viper-init.el @@ -922,6 +922,8 @@ Should be set in `viper-custom-file-name'." "Hooks run just after loading Viper." :type 'hook :group 'viper-hooks) +(make-obsolete-variable 'viper-load-hook + "use `with-eval-after-load' instead." "28.1") (defun viper-restore-cursor-type () (condition-case nil diff --git a/lisp/emulation/viper-mous.el b/lisp/emulation/viper-mous.el index 294705f7c3a..6ecfec548cb 100644 --- a/lisp/emulation/viper-mous.el +++ b/lisp/emulation/viper-mous.el @@ -66,20 +66,13 @@ or a triple-click." ;; time interval in millisecond within which successive clicks are ;; considered related (defcustom viper-multiclick-timeout (if (viper-window-display-p) - (if (featurep 'xemacs) - mouse-track-multi-click-time - double-click-time) + double-click-time 500) "Time interval in millisecond within which successive mouse clicks are considered related." :type 'integer :group 'viper-mouse) -;; current event click count; XEmacs only -(defvar viper-current-click-count 0) -;; time stamp of the last click event; XEmacs only -(defvar viper-last-click-event-timestamp 0) - ;; Local variable used to toggle wraparound search on click. (viper-deflocalvar viper-mouse-click-search-noerror t) @@ -279,11 +272,9 @@ See `viper-surrounding-word' for the definition of a word in this case." (setq interrupting-event (read-event)) (viper-mouse-event-p last-input-event))) (progn ; interrupted wait - (setq viper-global-prefix-argument arg) - ;; count this click for XEmacs - (viper-event-click-count click)) + (setq viper-global-prefix-argument arg)) ;; uninterrupted wait or the interrupting event wasn't a mouse event - (setq click-count (viper-event-click-count click)) + (setq click-count (event-click-count click)) (if (> click-count 1) (setq arg viper-global-prefix-argument viper-global-prefix-argument nil)) @@ -300,33 +291,8 @@ See `viper-surrounding-word' for the definition of a word in this case." (string-match "\\(mouse-\\|frame\\|screen\\|track\\)" (prin1-to-string (viper-event-key event))))) -;; XEmacs has no double-click events. So, we must simulate. -;; So, we have to simulate event-click-count. -(defun viper-event-click-count (click) - (if (featurep 'xemacs) (viper-event-click-count-xemacs click) - (event-click-count click))) - -(when (featurep 'xemacs) - - ;; kind of semaphore for updating viper-current-click-count - (defvar viper-counting-clicks-p nil) - - (defun viper-event-click-count-xemacs (click) - (let ((time-delta (- (event-timestamp click) - viper-last-click-event-timestamp)) - inhibit-quit) - (while viper-counting-clicks-p - (ignore)) - (setq viper-counting-clicks-p t) - (if (> time-delta viper-multiclick-timeout) - (setq viper-current-click-count 0)) - (discard-input) - (setq viper-current-click-count (1+ viper-current-click-count) - viper-last-click-event-timestamp (event-timestamp click)) - (setq viper-counting-clicks-p nil) - (if (viper-sit-for-short viper-multiclick-timeout t) - viper-current-click-count - 0)))) +(define-obsolete-function-alias 'viper-event-click-count + 'event-click-count "28.1") (declare-function viper-forward-word "viper-cmd" (arg)) (declare-function viper-adjust-window "viper-cmd" ()) @@ -364,11 +330,9 @@ this command. (setq viper-global-prefix-argument (or viper-global-prefix-argument arg) ;; remember command that was before the multiclick - this-command last-command) - ;; make sure we counted this event---needed for XEmacs only - (viper-event-click-count click)) + this-command last-command)) ;; uninterrupted wait - (setq click-count (viper-event-click-count click)) + (setq click-count (event-click-count click)) (setq click-word (viper-mouse-click-get-word click nil click-count)) (if (> click-count 1) diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el index ebad850e6b7..1561204151d 100644 --- a/lisp/emulation/viper-util.el +++ b/lisp/emulation/viper-util.el @@ -205,6 +205,7 @@ Otherwise return the normal value." ;; incorrect. However, this gives correct result in our cases, since we are ;; testing for sufficiently high Emacs versions. (defun viper-check-version (op major minor &optional type-of-emacs) + (declare (obsolete nil "28.1")) (if (and (boundp 'emacs-major-version) (boundp 'emacs-minor-version)) (and (cond ((eq type-of-emacs 'xemacs) (featurep 'xemacs)) ((eq type-of-emacs 'emacs) (featurep 'emacs)) diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el index 492c31bde74..8e7a34fc69c 100644 --- a/lisp/emulation/viper.el +++ b/lisp/emulation/viper.el @@ -1221,7 +1221,6 @@ These two lines must come in the order given.")) (viper-harness-minor-mode "outline") (viper-harness-minor-mode "allout") (viper-harness-minor-mode "xref") - (viper-harness-minor-mode "lmenu") (viper-harness-minor-mode "vc") (viper-harness-minor-mode "ltx-math") ; LaTeX-math-mode in AUC-TeX, which (viper-harness-minor-mode "latex") ; sits in one of these two files |