[Emacs-diffs] Changes to emacs/lisp/emulation/viper-macs.el

[Michael Kifer]

Index: emacs/lisp/emulation/viper-macs.el
diff -c emacs/lisp/emulation/viper-macs.el:1.31 
emacs/lisp/emulation/viper-macs.el:1.32
*** emacs/lisp/emulation/viper-macs.el:1.31     Mon Jul  4 17:29:04 2005
--- emacs/lisp/emulation/viper-macs.el  Sun Jul 10 18:46:24 2005
***************
*** 178,184 ****
        (if (member
             key
             '(?\b ?\d '^? '^H (control h) (control \?) backspace delete))
!           (setq key-seq (subseq key-seq 0 (- (length key-seq) 2))))
        (setq message
              (format
               ":map%s %s"
--- 178,184 ----
        (if (member
             key
             '(?\b ?\d '^? '^H (control h) (control \?) backspace delete))
!           (setq key-seq (viper-subseq key-seq 0 (- (length key-seq) 2))))
        (setq message
              (format
               ":map%s %s"
***************
*** 242,250 ****
        (cond ((member
                key
                '(?\b ?\d '^? '^H (control h) (control \?) backspace delete))
!              (setq key-seq (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 message
                     (format
                      ":unmap%s %s"
--- 242,250 ----
        (cond ((member
                key
                '(?\b ?\d '^? '^H (control h) (control \?) backspace delete))
!              (setq key-seq (viper-subseq key-seq 0 (- (length key-seq) 2))))
              ((member key '(tab (control i) ?\t))
!              (setq key-seq (viper-subseq key-seq 0 (1- (length key-seq))))
               (setq message
                     (format
                      ":unmap%s %s"
***************
*** 618,624 ****
  
      (if (null macro-alist-elt)
        (setq macro-alist-elt (car next-best-match)
!             unmatched-suffix (subseq event-seq (cdr next-best-match))))
  
      (cond ((null macro-alist-elt))
          ((setq macro-body (viper-kbd-buf-definition macro-alist-elt)))
--- 618,624 ----
  
      (if (null macro-alist-elt)
        (setq macro-alist-elt (car 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,707 ****
    (let ((len1 (length seq1))
        (len2 (length seq2)))
      (if (<= len1 len2)
!       (equal seq1 (subseq seq2 0 len1)))))
  
  ;; find the longest common prefix
  (defun viper-common-seq-prefix (&rest seqs)
--- 701,707 ----
    (let ((len1 (length seq1))
        (len2 (length seq2)))
      (if (<= len1 len2)
!       (equal seq1 (viper-subseq seq2 0 len1)))))
  
  ;; find the longest common prefix
  (defun viper-common-seq-prefix (&rest seqs)
***************
*** 766,772 ****
        (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)))
          (if (or (viper-kbd-buf-definition macro-def)
                  (viper-kbd-mode-definition macro-def)
                  (viper-kbd-global-definition macro-def))
--- 766,772 ----
        (setq macro-def (car lis)
            def-len (length (car macro-def)))
        (if (and (>= str-len 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))