Update of /cvsroot/foo/foo/elkfoo/scm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13910
Modified Files:
toplevel.foo.in
Log Message:
moved scripting related portion of code before loading of customization files
Index: toplevel.foo.in
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/scm/toplevel.foo.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** toplevel.foo.in 25 Aug 2004 23:16:33 -0000 1.5
--- toplevel.foo.in 26 Aug 2004 08:20:25 -0000 1.6
***************
*** 197,200 ****
--- 197,215 ----
(load file (global-environment)))
+ ;; scripting
+ (if (not (null? (command-line-args)))
+ (if (file-exists? (car (command-line-args)))
+ (begin
+ (set! foo-script-file (car (command-line-args)))
+ (set! load-foo-script-file #t))
+ (begin
+ (format #t "couldn't load foo script ~s\n" (car (command-line-args)))
+ (if (bound? 'foo:cleanup)
+ (foo:cleanup))
+ (exit)))
+ ;; load history (ignore errors)
+ (if (and (feature? 'readline.la) (bound? 'readline-read-history))
+ (readline-read-history (tilde-expand "~/.foo/foo_history"))))
+
;; std list of initialization files
(define foo-init-files
***************
*** 228,246 ****
(map load foo-init-files)
- ;; scripting
- (if (not (null? (command-line-args)))
- (if (file-exists? (car (command-line-args)))
- (begin
- (set! foo-script-file (car (command-line-args)))
- (set! load-foo-script-file #t))
- (begin
- (format #t "couldn't load foo script ~s\n" (car (command-line-args)))
- (if (bound? 'foo:cleanup)
- (foo:cleanup))
- (exit)))
- ;; load history (ignore errors)
- (if (and (feature? 'readline.la) (bound? 'readline-read-history))
- (readline-read-history (tilde-expand "~/.foo/foo_history"))))
-
(provide 'foo)
--- 243,246 ----
|
