[Win32forth-cvs] win32forth/src Boot.f, 1.5, 1.6 imageman.f, 1.22, 1.23

[Dirk B. <db...@us...>]

Update of /cvsroot/win32forth/win32forth/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22713/src

Modified Files:
	Boot.f imageman.f 
Log Message:
Some cleanup

Index: Boot.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/Boot.f,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Boot.f	24 Sep 2008 21:49:57 -0000	1.5
--- Boot.f	22 Dec 2008 11:04:52 -0000	1.6
***************
*** 5,11 ****
  cr .( Loading Boot.f : boot Win32Forth... ) cr
  
! 
! create config$ ," WIN32FOR.CFG"
! create userconfig$ ," WIN32FORUSER.CFG"
  
  \ ........ set the default system access strings ..........
--- 5,9 ----
  cr .( Loading Boot.f : boot Win32Forth... ) cr
  
! in-system
  
  \ ........ set the default system access strings ..........
***************
*** 18,51 ****
          s" /c " shell$ +place ;
  
! : .mem-free     ( -- )
!                 app-free 1000 / 1 u,.r ." k bytes free" ;
! 
! in-system
  
! : (ConsoleTitle) { \ $buff -- } \ set title of the console window
!         256 LocalAlloc: $buff
!         S" Win32Forth " $buff place
!         base @ decimal
!         version# ((version)) $buff +place
!         base !
!         $buff +NULL $buff 1+
!         CONHNDL call SetWindowText drop
! ;
  
! DEFER ConsoleTitle ' (ConsoleTitle) is ConsoleTitle
  
  
  : ForthBoot     ( -- )
                  cls
                  only forth also definitions
                  set-shell
                  stack-check-off           \ disable stack depth checking (can be enabled in userconfig if wanted)
!                 config$ count "path-file  \ search config file
!                 nip nip 0=                \ if found
!                 if   config$              \ load it (will display message)
!                      ['] $fload catch
!                      if MESSAGE then
!                 else cr ." WIN32FOR.CFG Config file not found"
!                 then
  
                  &EXCEPT @ 0= sys-size and
--- 16,52 ----
          s" /c " shell$ +place ;
  
! \ : .mem-free     ( -- )
! \                 app-free 1000 / 1 u,.r ." k bytes free" ;
  
! \ : (ConsoleTitle) { \ $buff -- } \ set title of the console window
! \         256 LocalAlloc: $buff
! \         S" Win32Forth " $buff place
! \         base @ decimal
! \         version# ((version)) $buff +place
! \         base !
! \         $buff +NULL $buff 1+
! \         CONHNDL call SetWindowText drop
! \ ;
! \
! \ DEFER ConsoleTitle ' (ConsoleTitle) is ConsoleTitle
  
! create config$     ," WIN32FOR.CFG"
! create userconfig$ ," WIN32FORUSER.CFG"
  
+ : LoadConfigFile { addr -- }
+                 addr count "path-file nip nip 0= \ search for config file
+                 if   addr ['] $fload catch \ load it (will display message)
+                      if MESSAGE then
+                 else cr ." File: " addr count type ."  not found"
+                 then ;
  
  : ForthBoot     ( -- )
                  cls
                  only forth also definitions
+ 
                  set-shell
                  stack-check-off           \ disable stack depth checking (can be enabled in userconfig if wanted)
! 
!                 config$ LoadConfigFile
  
                  &EXCEPT @ 0= sys-size and
***************
*** 58,64 ****
  
                  QUIT ;
- 
- 
- : LoadUserConfig ( -- ) \ load user configuration file
-         userconfig$ COUNT "path-file NIP NIP 0=
-         IF userconfig$ $FLOAD THEN ;
--- 59,60 ----

Index: imageman.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/imageman.f,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** imageman.f	2 Sep 2008 07:01:21 -0000	1.22
--- imageman.f	22 Dec 2008 11:04:53 -0000	1.23
***************
*** 907,911 ****
  
  : .appdir       ( -- ) \ type application directory
!                 &appdir COUNT TYPE ;
  
  
--- 907,911 ----
  
  : .appdir       ( -- ) \ type application directory
!                 &appdir COUNT ?dup if TYPE else drop ." not set" then ;