Mercurial > emacs
comparison lisp/emulation/viper-mous.el @ 91204:53108e6cea98
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 06 Dec 2007 09:51:45 +0000 |
parents | 880960b70474 3fab602f8cf5 |
children | 606f2d163a64 |
comparison
equal
deleted
inserted
replaced
91203:db40129142b2 | 91204:53108e6cea98 |
---|---|
40 ;; loading happens only in non-interactive compilation | 40 ;; loading happens only in non-interactive compilation |
41 ;; in order to spare non-viperized emacs from being viperized | 41 ;; in order to spare non-viperized emacs from being viperized |
42 (if noninteractive | 42 (if noninteractive |
43 (eval-when-compile | 43 (eval-when-compile |
44 (let ((load-path (cons (expand-file-name ".") load-path))) | 44 (let ((load-path (cons (expand-file-name ".") load-path))) |
45 (or (featurep 'viper-util) | |
46 (load "viper-util.el" nil nil 'nosuffix)) | |
47 (or (featurep 'viper-cmd) | 45 (or (featurep 'viper-cmd) |
48 (load "viper-cmd.el" nil nil 'nosuffix)) | 46 (load "viper-cmd.el" nil t 'nosuffix)) |
49 ))) | 47 ))) |
50 ;; end pacifier | 48 ;; end pacifier |
51 | 49 |
52 (require 'viper-util) | 50 (require 'viper-util) |
53 | 51 |