[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/emulation/viper-macs.el
From: |
Michael Kifer |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/emulation/viper-macs.el |
Date: |
Tue, 20 Sep 2005 13:47:38 -0400 |
Index: emacs/lisp/emulation/viper-macs.el
diff -c emacs/lisp/emulation/viper-macs.el:1.34
emacs/lisp/emulation/viper-macs.el:1.35
*** emacs/lisp/emulation/viper-macs.el:1.34 Sun Sep 18 12:39:40 2005
--- emacs/lisp/emulation/viper-macs.el Tue Sep 20 17:47:26 2005
***************
*** 118,124 ****
(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"
(viper-display-macro macro-name)
(if ins "Insert" "Vi")))
))
--- 118,124 ----
(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. Type macro definition followed by
`C-x )'"
(viper-display-macro macro-name)
(if ins "Insert" "Vi")))
))
***************
*** 170,176 ****
((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)
(while
(not (member key
'(?\C-m ?\n (control m) (control j) return linefeed)))
--- 170,176 ----
((stringp macro-name)
(setq macro-name (vconcat macro-name)))
(t (setq macro-name (vconcat (prin1-to-string macro-name)))))
! (message ":map%s <Macro Name>" variant)(sit-for 2)
(while
(not (member key
'(?\C-m ?\n (control m) (control j) return linefeed)))
***************
*** 442,451 ****
scope)
viper-custom-file-name))
- ;; 2005-09-18 T06:41:22-0400 (Sunday) D. Goel
- ;; From careful parsing of the above code, it looks like msg
- ;; couldn't be nil when we reach here. Since it is a string,
- ;; and a complicated one too, we might as well provide it a "%s"
(message "%s" msg)
))
--- 442,447 ----