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.

diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el
index 56ed2f7d99fa7b2b4d9efe0ff0bafdebfcbf60ca..f64960dd75374c9ac903558bdb384b13d7193237 100644 (file)
--- 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 243a0a8d56f5db9896f98def749eef7a61335e19..3dd6a012ab3aca66a9b885e04cc0baa7c8e1cf53 100644 (file)
--- 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))