Mercurial > emacs
diff lisp/emulation/viper-macs.el @ 90201:fbb2bea03df9
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-69
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 474-484)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 88-91)
- Merge from emacs--cvs-trunk--0
- Update FSF's address in GPL notices
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 14 Jul 2005 08:02:00 +0000 |
parents | f9a65d7ebd29 a4c59075cac8 |
children | edf295560b5a |
line wrap: on
line diff
--- a/lisp/emulation/viper-macs.el Thu Jul 07 12:43:14 2005 +0000 +++ b/lisp/emulation/viper-macs.el Thu Jul 14 08:02:00 2005 +0000 @@ -178,7 +178,7 @@ (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" @@ -242,9 +242,9 @@ (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" @@ -618,7 +618,7 @@ (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 +701,7 @@ (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 +766,7 @@ (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))