diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2019-06-20 00:59:07 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2019-06-20 12:51:39 +0200 |
| commit | 717a99dacffaa8981d907d23e0fb0af7a127149f (patch) | |
| tree | 045e21c4d576829372f5b8c6055f6bd4e4e34b5c | |
| parent | dfec2bc7853fbef72f4306dcee3807b5dc9f6064 (diff) | |
| download | emacs-717a99dacffaa8981d907d23e0fb0af7a127149f.tar.gz | |
Clean up after previous viper patch
* lisp/emulation/viper-ex.el (viper-get-ex-address-subr): Fix
syntax error in last checkin.
(viper-ex): Don't use now-obsolete function.
| -rw-r--r-- | lisp/emulation/viper-ex.el | 10 | ||||
| -rw-r--r-- | lisp/emulation/viper-macs.el | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el index 56ed2f7d99f..f64960dd753 100644 --- a/lisp/emulation/viper-ex.el +++ b/lisp/emulation/viper-ex.el @@ -678,7 +678,7 @@ reversed." (viper-get-ex-token) (cond ((memq ex-token-type '(command end-mark)) (if address (setq ex-addresses (cons address ex-addresses))) - (viper-deactivate-mark) + (deactivate-mark) (let ((cmd (ex-cmd-assoc ex-token ex-token-alist))) (if (null cmd) (error "`%s': %s" ex-token viper-BadExCommand)) @@ -881,9 +881,7 @@ reversed." (if (null ex-token) (exchange-point-and-mark) (goto-char - (viper-register-to-point - (1+ (- ex-token ?a))) - 'enforce-buffer)) + (viper-register-to-point (1+ (- ex-token ?a)) 'enforce-buffer))) (setq address (point-marker))))) address)) @@ -1175,7 +1173,7 @@ reversed." (princ "\n=============\n") (princ "\nThe numbers can be given as counts to :next. ") (princ "\n\nPress any key to continue...\n\n")) - (viper-read-event)))))) + (read-event)))))) ;; Ex cd command. Default directory of this buffer changes (defun ex-cd () @@ -2242,7 +2240,7 @@ Type `mak ' (including the space) to run make with no args." (with-output-to-temp-buffer " *viper-info*" (princ (concat "\n" file "\n\n\t" info "\n\n"))) (let ((inhibit-quit t)) - (viper-set-unread-command-events (viper-read-event))) + (viper-set-unread-command-events (read-event))) (kill-buffer " *viper-info*"))) )) diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el index 243a0a8d56f..3dd6a012ab3 100644 --- a/lisp/emulation/viper-macs.el +++ b/lisp/emulation/viper-macs.el @@ -874,7 +874,7 @@ mistakes in macro names to be passed to this function is to use ;; read-key then events will be converted to keys, and sometimes ;; (e.g., (control \[)) those keys differ from the corresponding events. ;; So, do not use (setq next-event (read-key)) - (setq next-event (viper-read-event)) + (setq next-event (read-event)) (or (viper-mouse-event-p next-event) (setq lis (vconcat lis (vector next-event))))) lis)) |