Update of /project/eclipse/cvsroot/eclipse In directory cl-net:/tmp/cvs-serv24108

Modified Files: eclipse.lisp global.lisp Log Message: Fix: bug raised by David Thompson: error during start up because a directory named .eclipse is in the way.

--- /project/eclipse/cvsroot/eclipse/eclipse.lisp 2010/04/02 09:57:53 1.30 +++ /project/eclipse/cvsroot/eclipse/eclipse.lisp 2010/04/23 14:36:49 1.31 @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp; Package: ECLIPSE-INTERNALS -*- -;;; $Id: eclipse.lisp,v 1.30 2010/04/02 09:57:53 ihatchondo Exp $ +;;; $Id: eclipse.lisp,v 1.31 2010/04/23 14:36:49 ihatchondo Exp $ ;;; ;;; ECLIPSE. The Common Lisp Window Manager. ;;; Copyright (C) 2002 Iban HATCHONDO @@ -220,7 +220,7 @@ :fill-style :solid :line-style :solid :line-width 1 :exposures :OFF)) ;; load personal configuration file, or the default one. - (labels ((load-if (f) (and (probe-file f) (load-config-file f)))) + (labels ((load-if (f) (and (file-exists-p f) (load-config-file f)))) (or (load-if (home-subdirectory cl-user::*eclipse-initfile*)) (load-if (eclipse-path "eclipserc")) (error "Unable to read a configuration file.~%"))) --- /project/eclipse/cvsroot/eclipse/global.lisp 2009/11/17 22:40:49 1.36 +++ /project/eclipse/cvsroot/eclipse/global.lisp 2010/04/23 14:36:49 1.37 @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp; Package: ECLIPSE-INTERNALS -*- -;;; $Id: global.lisp,v 1.36 2009/11/17 22:40:49 ihatchondo Exp $ +;;; $Id: global.lisp,v 1.37 2010/04/23 14:36:49 ihatchondo Exp $ ;;; ;;; This file is part of Eclipse. ;;; Copyright (C) 2001, 2002 Iban HATCHONDO @@ -216,7 +216,6 @@ #-(or allegro clisp cmu gcl lispworks lucid mcl sbcl scl) (error 'not-implemented :proc (list 'getenv var)))

- (defun (setf getenv) (val var) "Sets the value of the environment variable named var to val." #+allegro (setf (sys::getenv (string var)) (string val)) @@ -254,6 +253,12 @@ #+cmu (extensions:unix-namestring (user-homedir-pathname)) #-cmu (namestring (user-homedir-pathname)))

+(defun file-exists-p (filename) + "Returns true if the given filename is an existing file and not a directory." + (and #+clisp (not (probe-directory (make-pathname :directory filename))) + #-clisp (not (probe-file (make-pathname :directory filename))) + (probe-file filename))) + ;;;; Error handler. ;; The X errors handler. ;; For debug purpose: it use *stderr* as output stream.