*** empty log message ***

[gnu-emacs] / lisp / emulation / viper-macs.el

diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el
index 8a3ce5db9eb405106d1955060fc03472f212bc52..d401c148ad6ee0e9564163dfef413a569cd6f86e 100644 (file)
--- a/lisp/emulation/viper-macs.el
+++ b/lisp/emulation/viper-macs.el
@@ -1,6 +1,7 @@
 ;;; viper-macs.el --- functions implementing keyboard macros for Viper
 
-;; Copyright (C) 1994, 95, 96, 97, 2000, 01, 02, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
@@ -117,7 +118,7 @@ a key is a symbol, e.g., `a', `\\1', `f2', etc., or a list, e.g.,
       (define-key viper-vi-intercept-map "\C-x)" 'viper-end-mapping-kbd-macro)
       (define-key viper-insert-intercept-map "\C-x)" 'viper-end-mapping-kbd-macro)
       (define-key viper-emacs-intercept-map "\C-x)" 'viper-end-mapping-kbd-macro)
-      (message "Mapping %S in %s state.  Hit `C-x )' to complete the mapping"
+      (message "Mapping %S in %s state.  Type macro definition followed by `C-x )'"
               (viper-display-macro macro-name)
               (if ins "Insert" "Vi")))
     ))
@@ -169,7 +170,7 @@ a key is a symbol, e.g., `a', `\\1', `f2', etc., or a list, e.g.,
              ((stringp macro-name)
               (setq macro-name (vconcat macro-name)))
              (t (setq macro-name (vconcat (prin1-to-string macro-name)))))
-      (message ":map%s <Name>" variant)(sit-for 2)
+      (message ":map%s <Macro Name>" variant)(sit-for 2)
       (while
          (not (member key
                       '(?\C-m ?\n (control m) (control j) return linefeed)))
@@ -178,14 +179,14 @@ a key is a symbol, e.g., `a', `\\1', `f2', etc., or a list, e.g.,
        (if (member
             key
             '(?\b ?\d '^? '^H (control h) (control \?) backspace delete))
-           (setq key-seq (subseq key-seq 0 (- (length key-seq) 2))))
+           (setq key-seq (viper-subseq key-seq 0 (- (length key-seq) 2))))
        (setq message
              (format
               ":map%s %s"
               variant (if (> (length key-seq) 0)
                           (prin1-to-string (viper-display-macro key-seq))
                         "")))
-       (message message)
+       (message "%s" message)
        (setq event (viper-read-key))
        ;;(setq event (viper-read-event))
        (setq key
@@ -242,9 +243,9 @@ a key is a symbol, e.g., `a', `\\1', `f2', etc., or a list, e.g.,
        (cond ((member
                key
                '(?\b ?\d '^? '^H (control h) (control \?) backspace delete))
-              (setq key-seq (subseq key-seq 0 (- (length key-seq) 2))))
+              (setq key-seq (viper-subseq key-seq 0 (- (length key-seq) 2))))
              ((member key '(tab (control i) ?\t))
-              (setq key-seq (subseq key-seq 0 (1- (length key-seq))))
+              (setq key-seq (viper-subseq key-seq 0 (1- (length key-seq))))
               (setq message
                     (format
                      ":unmap%s %s"
@@ -262,7 +263,7 @@ a key is a symbol, e.g., `a', `\\1', `f2', etc., or a list, e.g.,
                           (prin1-to-string
                            (viper-display-macro key-seq))
                         "")))
-       (message message)
+       (message "%s" message)
        (setq event (viper-read-key))
        ;;(setq event (viper-read-event))
        (setq key
@@ -441,7 +442,7 @@ If SCOPE is nil, the user is asked to specify the scope."
                       scope)
               viper-custom-file-name))
 
-         (message msg)
+         (message "%s" msg)
          ))
 
     (setq new-elt
@@ -618,7 +619,7 @@ name from there."
 
     (if (null macro-alist-elt)
        (setq macro-alist-elt (car next-best-match)
-             unmatched-suffix (subseq event-seq (cdr next-best-match))))
+             unmatched-suffix (viper-subseq event-seq (cdr next-best-match))))
 
     (cond ((null macro-alist-elt))
          ((setq macro-body (viper-kbd-buf-definition macro-alist-elt)))
@@ -701,7 +702,7 @@ name from there."
   (let ((len1 (length seq1))
        (len2 (length seq2)))
     (if (<= len1 len2)
-       (equal seq1 (subseq seq2 0 len1)))))
+       (equal seq1 (viper-subseq seq2 0 len1)))))
 
 ;; find the longest common prefix
 (defun viper-common-seq-prefix (&rest seqs)
@@ -766,7 +767,7 @@ name from there."
       (setq macro-def (car lis)
            def-len (length (car macro-def)))
       (if (and (>= str-len def-len)
-              (equal (car macro-def) (subseq str 0 def-len)))
+              (equal (car macro-def) (viper-subseq str 0 def-len)))
          (if (or (viper-kbd-buf-definition macro-def)
                  (viper-kbd-mode-definition macro-def)
                  (viper-kbd-global-definition macro-def))