X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Femodules.c;h=22eda2b41a0d5b92e247e6315283e51bd29b6bf0;hb=2265c01ed23e9411a4e24786273599d1426d63e2;hp=eb03bc871c5bf047c500395a044c6ba43e4ec2ef;hpb=59eec5f21669e81977b5b1fe9bf717cab49cf7fb;p=chise%2Fxemacs-chise.git.1

diff --git a/src/emodules.c b/src/emodules.c
index eb03bc8..22eda2b 100644
--- a/src/emodules.c
+++ b/src/emodules.c
@@ -79,7 +79,7 @@ XEmacs, and then reload those new or changed modules that are required.
 Messages informing you of the progress of the load are displayed unless
 the variable `load-modules-quietly' is non-NIL.
 */
-       (file,name,version))
+       (file, name, version))
 {
   char *mod, *mname, *mver;
   int speccount = specpdl_depth();
@@ -118,7 +118,7 @@ referring to variables inside the module code.  However, once you have
 requested a module to be unloaded, it will be unloaded from memory as
 soon as the last reference to symbols within the module is destroyed.
 */
-       (file,name,version))
+       (file, name, version))
 {
   int x;
   char *mod, *mname, *mver;
@@ -426,6 +426,7 @@ emodules_load(const char *module, const char *modname, const char *modver)
     {
       emodules_depth--;
       dll_close (dlhandle);
+      dlhandle = 0;  /* Zero this out before module_load_unwind runs */
       return;
     }
 
@@ -581,7 +582,7 @@ when a dynamic module is loaded.
 */);
 
   /* #### Export this to Lisp */
-  Vmodule_extensions = build_string (":.ell:.so:.dll");
+  Vmodule_extensions = build_string (":.ell:.so:.dll:.dylib");
   staticpro (&Vmodule_extensions);
 
   load_modules_quietly = 0;