Commit 717a99da authored by Lars Ingebrigtsen's avatar Lars Ingebrigtsen

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.
parent dfec2bc7
...@@ -678,7 +678,7 @@ reversed." ...@@ -678,7 +678,7 @@ reversed."
(viper-get-ex-token) (viper-get-ex-token)
(cond ((memq ex-token-type '(command end-mark)) (cond ((memq ex-token-type '(command end-mark))
(if address (setq ex-addresses (cons address ex-addresses))) (if address (setq ex-addresses (cons address ex-addresses)))
(viper-deactivate-mark) (deactivate-mark)
(let ((cmd (ex-cmd-assoc ex-token ex-token-alist))) (let ((cmd (ex-cmd-assoc ex-token ex-token-alist)))
(if (null cmd) (if (null cmd)
(error "`%s': %s" ex-token viper-BadExCommand)) (error "`%s': %s" ex-token viper-BadExCommand))
...@@ -881,9 +881,7 @@ reversed." ...@@ -881,9 +881,7 @@ reversed."
(if (null ex-token) (if (null ex-token)
(exchange-point-and-mark) (exchange-point-and-mark)
(goto-char (goto-char
(viper-register-to-point (viper-register-to-point (1+ (- ex-token ?a)) 'enforce-buffer)))
(1+ (- ex-token ?a)))
'enforce-buffer))
(setq address (point-marker))))) (setq address (point-marker)))))
address)) address))
...@@ -1175,7 +1173,7 @@ reversed." ...@@ -1175,7 +1173,7 @@ reversed."
(princ "\n=============\n") (princ "\n=============\n")
(princ "\nThe numbers can be given as counts to :next. ") (princ "\nThe numbers can be given as counts to :next. ")
(princ "\n\nPress any key to continue...\n\n")) (princ "\n\nPress any key to continue...\n\n"))
(viper-read-event)))))) (read-event))))))
;; Ex cd command. Default directory of this buffer changes ;; Ex cd command. Default directory of this buffer changes
(defun ex-cd () (defun ex-cd ()
...@@ -2242,7 +2240,7 @@ Type `mak ' (including the space) to run make with no args." ...@@ -2242,7 +2240,7 @@ Type `mak ' (including the space) to run make with no args."
(with-output-to-temp-buffer " *viper-info*" (with-output-to-temp-buffer " *viper-info*"
(princ (concat "\n" file "\n\n\t" info "\n\n"))) (princ (concat "\n" file "\n\n\t" info "\n\n")))
(let ((inhibit-quit t)) (let ((inhibit-quit t))
(viper-set-unread-command-events (viper-read-event))) (viper-set-unread-command-events (read-event)))
(kill-buffer " *viper-info*"))) (kill-buffer " *viper-info*")))
)) ))
......
...@@ -874,7 +874,7 @@ mistakes in macro names to be passed to this function is to use ...@@ -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 ;; read-key then events will be converted to keys, and sometimes
;; (e.g., (control \[)) those keys differ from the corresponding events. ;; (e.g., (control \[)) those keys differ from the corresponding events.
;; So, do not use (setq next-event (read-key)) ;; 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) (or (viper-mouse-event-p next-event)
(setq lis (vconcat lis (vector next-event))))) (setq lis (vconcat lis (vector next-event)))))
lis)) lis))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment