comparison lisp/viper/viper.el @ 177:6075d714658b r20-3b15

Import from CVS: tag r20-3b15
author cvs
date Mon, 13 Aug 2007 09:51:16 +0200
parents 2d532a89d707
children bfd6434d15b3
comparison
equal deleted inserted replaced
176:6866abce6aaf 177:6075d714658b
308 ;; loading happens only in non-interactive compilation 308 ;; loading happens only in non-interactive compilation
309 ;; in order to spare non-viperized emacs from being viperized 309 ;; in order to spare non-viperized emacs from being viperized
310 (if noninteractive 310 (if noninteractive
311 (eval-when-compile 311 (eval-when-compile
312 (let ((load-path (cons (expand-file-name ".") load-path))) 312 (let ((load-path (cons (expand-file-name ".") load-path)))
313 (or (featurep 'viper-init)
314 (load "viper-init.el" nil nil 'nosuffix))
313 (or (featurep 'viper-cmd) 315 (or (featurep 'viper-cmd)
314 (load "viper-cmd.el" nil nil 'nosuffix)) 316 (load "viper-cmd.el" nil nil 'nosuffix))
315 ))) 317 )))
316 ;; end pacifier 318 ;; end pacifier
319
320 (require 'viper-init)
317 321
318 ;; better be defined before Viper custom group. 322 ;; better be defined before Viper custom group.
319 (defvar vip-custom-file-name (vip-convert-standard-file-name "~/.viper") 323 (defvar vip-custom-file-name (vip-convert-standard-file-name "~/.viper")
320 "Viper customisation file. 324 "Viper customisation file.
321 If set by the user, this must be done _before_ Viper is loaded in `~/.emacs'.") 325 If set by the user, this must be done _before_ Viper is loaded in `~/.emacs'.")