(vip-repeat-from-history-key): new default.

(vip-read-fast-keysequence,ex-unmap-read-args,ex-map-read-args):
changed to use vip-read-key.

1 files changed, 7 insertions, 5 deletions

diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el
index 5cce77a5874..0f0b0cdba7a 100644
--- a/lisp/emulation/viper-macs.el
+++ b/lisp/emulation/viper-macs.el
@@ -48,7 +48,7 @@
 This also controls ESC-keysequences generated by keyboard function keys.")
 
 
-(defvar vip-repeat-from-history-key 'f1
+(defvar vip-repeat-from-history-key 'f12
   "Prefix key for invocation of vip-repeat-from-history function,
 which repeats previous destructive commands from the history of such
 commands.
@@ -154,7 +154,8 @@ a key is a symbol, e.g., `a', `\\1', `f2', etc., or a list, e.g.,
                              (prin1-to-string (vip-display-macro key-seq))
                            "")))
         (message message)
-        (setq event (vip-read-event))
+        (setq event (vip-read-key))
+        ;;(setq event (vip-read-event))
         (setq key
               (if (vip-mouse-event-p event)
                   (progn
@@ -228,7 +229,8 @@ a key is a symbol, e.g., `a', `\\1', `f2', etc., or a list, e.g.,
                                    (vip-display-macro key-seq))
                                 "")))
         (message message)
-        (setq event (vip-read-event))
+        (setq event (vip-read-key))
+        ;;(setq event (vip-read-event))
         (setq key
               (if (vip-mouse-event-p event)
                   (progn
@@ -250,7 +252,6 @@ a key is a symbol, e.g., `a', `\\1', `f2', etc., or a list, e.g.,
     ))
     
     
-    
 (defun vip-end-mapping-kbd-macro (&optional ignore)
   "Terminate kbd macro."
   (interactive)
@@ -848,7 +849,8 @@ there."
         next-event)
     (while (and (vip-fast-keysequence-p)
                 (vip-keyseq-is-a-possible-macro lis macro-alist))
-      (setq next-event (vip-read-event))
+      (setq next-event (vip-read-key))
+      ;;(setq next-event (vip-read-event))
       (or (vip-mouse-event-p next-event)
           (setq lis (vconcat lis (vector next-event)))))
     lis))