From: <cli...@li...> - 2010-12-15 01:19:49
|
Send clisp-cvs mailing list submissions to cli...@li... To subscribe or unsubscribe via the World Wide Web, visit https://lists.sourceforge.net/lists/listinfo/clisp-cvs or, via email, send a message with subject or body 'help' to cli...@li... You can reach the person managing the list at cli...@li... When replying, please edit your Subject line so it is more specific than "Re: Contents of clisp-cvs digest..." CLISP CVS commits for today Today's Topics: 1. clisp/src ChangeLog,1.7581,1.7582 defs1.lisp,1.81,1.82 (Sam Steingold) ---------------------------------------------------------------------- Message: 1 Date: Thu, 02 Dec 2010 23:33:51 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/src ChangeLog,1.7581,1.7582 defs1.lisp,1.81,1.82 To: cli...@li... Message-ID: <E1P...@sf...> Update of /cvsroot/clisp/clisp/src In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv14165/src Modified Files: ChangeLog defs1.lisp Log Message: * src/defs1.lisp (load-path-augmentations): delete NILs (augment-load-path): remove (with-augmented-load-path): use UNION instead of AUGMENT-LOAD-PATH to avoid modifying the global value of *LOAD-PATHS* Index: ChangeLog =================================================================== RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.7581 retrieving revision 1.7582 diff -u -d -r1.7581 -r1.7582 --- ChangeLog 2 Dec 2010 01:16:04 -0000 1.7581 +++ ChangeLog 2 Dec 2010 23:33:49 -0000 1.7582 @@ -1,3 +1,10 @@ +2010-12-02 Sam Steingold <sd...@gn...> + + * defs1.lisp (load-path-augmentations): delete NILs + (augment-load-path): remove + (with-augmented-load-path): use UNION instead of AUGMENT-LOAD-PATH + to avoid modifying the global value of *LOAD-PATHS* + 2010-12-01 Sam Steingold <sd...@gn...> * pathname.d (SET-LIB-DIRECTORY): call TRUENAME on argument to Index: defs1.lisp =================================================================== RCS file: /cvsroot/clisp/clisp/src/defs1.lisp,v retrieving revision 1.81 retrieving revision 1.82 diff -u -d -r1.81 -r1.82 --- defs1.lisp 14 Nov 2010 16:02:41 -0000 1.81 +++ defs1.lisp 2 Dec 2010 23:33:49 -0000 1.82 @@ -157,25 +157,23 @@ (defvar *user-lib-directory* nil "The location of user-installed modules.") -(defun augment-load-path (paths) - (dolist (path paths *load-paths*) - (when path (setq *load-paths* (adjoin path *load-paths* :test #'equal))))) - (defun load-path-augmentations (dynmod) - (list (merge-pathnames dynmod *lib-directory*) - (and *user-lib-directory* - (merge-pathnames dynmod *user-lib-directory*)) - (and *load-pathname* ; not truename to respect symlinks - (make-pathname :name nil :type nil :defaults *load-pathname*)) - (and *compile-file-pathname* ; could be called by eval-when-compile - (make-pathname :name nil :type nil - :defaults *compile-file-pathname*)))) + (delete nil + (list (merge-pathnames dynmod *lib-directory*) + (and *user-lib-directory* + (merge-pathnames dynmod *user-lib-directory*)) + (and *load-pathname* ; not truename to respect symlinks + (make-pathname :name nil :type nil :defaults *load-pathname*)) + (and *compile-file-pathname* ; could be called by eval-when-compile + (make-pathname :name nil :type nil + :defaults *compile-file-pathname*))))) (defmacro with-augmented-load-path (dirs &body body) `(let ((*load-paths* ;; the name "dynmod/" used here should be in sync with clisp-link - (augment-load-path - ,(if dirs `(list ,@dirs) '(load-path-augmentations "dynmod/"))))) + (union *load-paths* + ,(if dirs `(list ,@dirs) '(load-path-augmentations "dynmod/")) + :test #+win32 #'equalp #-win32 #'equal))) ,@body)) (defvar *module-provider-functions* '() ------------------------------ ------------------------------------------------------------------------------ Increase Visibility of Your 3D Game App & Earn a Chance To Win $500! Tap into the largest installed PC base & get more eyes on your game by optimizing for Intel(R) Graphics Technology. Get started today with the Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs. http://p.sf.net/sfu/intelisp-dev2dev ------------------------------ _______________________________________________ clisp-cvs mailing list cli...@li... https://lists.sourceforge.net/lists/listinfo/clisp-cvs End of clisp-cvs Digest, Vol 56, Issue 2 **************************************** |