Mercurial > hg > xemacs-beta
comparison lisp/viper/viper-macs.el @ 163:0132846995bd r20-3b8
Import from CVS: tag r20-3b8
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 09:43:35 +0200 |
| parents | 6a378aca36af |
| children | 2d532a89d707 |
comparison
equal
deleted
inserted
replaced
| 162:4de2936b4e77 | 163:0132846995bd |
|---|---|
| 26 ;; compiler pacifier | 26 ;; compiler pacifier |
| 27 (defvar vip-ex-work-buf) | 27 (defvar vip-ex-work-buf) |
| 28 (defvar vip-custom-file-name) | 28 (defvar vip-custom-file-name) |
| 29 (defvar vip-current-state) | 29 (defvar vip-current-state) |
| 30 | 30 |
| 31 (eval-when-compile | 31 ;; loading happens only in non-interactive compilation |
| 32 (let ((load-path (cons (expand-file-name ".") load-path))) | 32 ;; in order to spare non-viperized emacs from being viperized |
| 33 (or (featurep 'viper-util) | 33 (if noninteractive |
| 34 (load "viper-util.el" nil nil 'nosuffix)) | 34 (eval-when-compile |
| 35 (or (featurep 'viper-keym) | 35 (let ((load-path (cons (expand-file-name ".") load-path))) |
| 36 (load "viper-keym.el" nil nil 'nosuffix)) | 36 (or (featurep 'viper-util) |
| 37 (or (featurep 'viper-mous) | 37 (load "viper-util.el" nil nil 'nosuffix)) |
| 38 (load "viper-mous.el" nil nil 'nosuffix)) | 38 (or (featurep 'viper-keym) |
| 39 (or (featurep 'viper) | 39 (load "viper-keym.el" nil nil 'nosuffix)) |
| 40 (load "viper.el" nil nil 'nosuffix)) | 40 (or (featurep 'viper-mous) |
| 41 )) | 41 (load "viper-mous.el" nil nil 'nosuffix)) |
| 42 (or (featurep 'viper-cmd) | |
| 43 (load "viper-cmd.el" nil nil 'nosuffix)) | |
| 44 ))) | |
| 42 ;; end pacifier | 45 ;; end pacifier |
| 43 | 46 |
| 44 (require 'viper-util) | 47 (require 'viper-util) |
| 45 (require 'viper-keym) | 48 (require 'viper-keym) |
| 46 | 49 |
| 313 (ex-fixup-history (format "map%s %S %S" mod-char | 316 (ex-fixup-history (format "map%s %S %S" mod-char |
| 314 (vip-display-macro macro-name) | 317 (vip-display-macro macro-name) |
| 315 (vip-display-macro macro-body))) | 318 (vip-display-macro macro-body))) |
| 316 )) | 319 )) |
| 317 | 320 |
| 318 | |
| 319 | |
| 320 (defadvice start-kbd-macro (after vip-kbd-advice activate) | |
| 321 "Remove Viper's intercepting bindings for C-x ). | |
| 322 This may be needed if the previous `:map' command terminated abnormally." | |
| 323 (define-key vip-vi-intercept-map "\C-x)" nil) | |
| 324 (define-key vip-insert-intercept-map "\C-x)" nil) | |
| 325 (define-key vip-emacs-intercept-map "\C-x)" nil)) | |
| 326 | 321 |
| 327 | 322 |
| 328 | 323 |
| 329 ;;; Recording, unrecording, executing | 324 ;;; Recording, unrecording, executing |
| 330 | 325 |