Mercurial > hg > xemacs-beta
changeset 1750:7580e52a8218
[xemacs-hg @ 2003-10-15 03:09:02 by james]
Define module-load-path and module-extensions even when compiling without modulesupport.
| author | james |
|---|---|
| date | Wed, 15 Oct 2003 03:09:03 +0000 |
| parents | c438060b26c6 |
| children | 5a9a66ba67ca |
| files | src/ChangeLog src/Makefile.in.in src/emacs.c src/emodules.c src/emodules.h |
| diffstat | 5 files changed, 29 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Oct 14 17:27:54 2003 +0000 +++ b/src/ChangeLog Wed Oct 15 03:09:03 2003 +0000 @@ -1,3 +1,11 @@ +2003-10-14 Jerry James <james@xemacs.org> + + * Makefile.in.in (shlib_objs): Remove emodules.o. + * Makefile.in.in (objs): Add emodules.o; it always has content now. + * emacs.c (main_1): Call vars_of_module to define module-extensions. + * emodules.c: Always set Vmodule_load_path and Vmodule_extensions. + * emodules.h: Vmodule_load_path is now static. + 2003-10-15 Stephen J. Turnbull <stephen@xemacs.org> * mule-charset.c (get_unallocated_leading_byte): #endif->#else.
--- a/src/Makefile.in.in Tue Oct 14 17:27:54 2003 +0000 +++ b/src/Makefile.in.in Wed Oct 15 03:09:03 2003 +0000 @@ -223,7 +223,7 @@ #endif #ifdef HAVE_SHLIB -shlib_objs=sysdll.o emodules.o +shlib_objs=sysdll.o # ifdef HAVE_MS_WINDOWS export_lib=xemacs-export.o xemacs-export.o: xemacs.def @@ -258,7 +258,7 @@ console-stream.o\ data.o $(database_objs) $(debug_objs) device.o dired.o doc.o doprnt.o\ dynarr.o \ - editfns.o elhash.o emacs.o eval.o events.o\ + editfns.o elhash.o emacs.o emodules.o eval.o events.o\ event-stream.o $(event_unixoid_objs) $(extra_objs) extents.o\ faces.o file-coding.o fileio.o $(LOCK_OBJ) filemode.o floatfns.o fns.o \ font-lock.o frame.o\
--- a/src/emacs.c Tue Oct 14 17:27:54 2003 +0000 +++ b/src/emacs.c Wed Oct 15 03:09:03 2003 +0000 @@ -1811,9 +1811,7 @@ vars_of_menubar (); #endif vars_of_minibuf (); -#ifdef HAVE_SHLIB vars_of_module (); -#endif #ifdef WIN32_NATIVE vars_of_dired_mswindows (); vars_of_nt ();
--- a/src/emodules.c Tue Oct 14 17:27:54 2003 +0000 +++ b/src/emodules.c Wed Oct 15 03:09:03 2003 +0000 @@ -21,6 +21,12 @@ #include "emodules.h" #include "sysdll.h" +/* Load path */ +static Lisp_Object Vmodule_load_path; + +/* Module lFile extensions */ +static Lisp_Object Vmodule_extensions; + #ifdef HAVE_SHLIB /* CE-Emacs version number */ @@ -33,8 +39,6 @@ as it allows the unbinding of symbol-value-forward variables. */ int unloading_module; -/* Load path */ -Lisp_Object Vmodule_load_path; Lisp_Object Qdll_error; Lisp_Object Qmodule, Qunload_module, module_tag; @@ -49,8 +53,6 @@ dll_handle dlhandle; /* Dynamic lib handle */ } emodules_list; -static Lisp_Object Vmodule_extensions; - static int emodules_depth; static dll_handle dlhandle; static emodules_list *modules; @@ -576,9 +578,14 @@ modnum = 0; } +#endif /* HAVE_SHLIB */ + void vars_of_module (void) { +#ifdef HAVE_SHLIB + Fprovide (intern ("modules")); + reinit_vars_of_module (); DEFVAR_LISP ("module-version", &Vmodule_version /* @@ -603,6 +610,14 @@ */); load_modules_quietly = 0; + DEFVAR_BOOL ("unloading-module", &unloading_module /* +Used internally by `unload-feature'. Do not set this variable. +Danger, danger, Will Robinson! +*/); + unloading_module = 0; + +#endif /* HAVE_SHLIB */ + DEFVAR_LISP ("module-load-path", &Vmodule_load_path /* *List of directories to search for dynamic modules to load. Each element is a string (directory name) or nil (try default directory). @@ -625,12 +640,6 @@ */); Vmodule_load_path = Qnil; - DEFVAR_BOOL ("unloading-module", &unloading_module /* -Used internally by `unload-feature'. Do not set this variable. -Danger, danger, Will Robinson! -*/); - unloading_module = 0; - DEFVAR_LISP ("module-extensions", &Vmodule_extensions /* *List of filename extensions to use when searching for dynamic modules. */); @@ -639,8 +648,4 @@ build_string (".dll"), build_string (".dylib"), build_string ("")); - - Fprovide (intern ("modules")); } - -#endif /* HAVE_SHLIB */
--- a/src/emodules.h Tue Oct 14 17:27:54 2003 +0000 +++ b/src/emodules.h Wed Oct 15 03:09:03 2003 +0000 @@ -46,9 +46,6 @@ /* Module loading technology version number */ extern Lisp_Object Vmodule_version; -/* Load path */ -extern Lisp_Object Vmodule_load_path; - /* XEmacs version Information */ extern Lisp_Object Vemacs_major_version; extern Lisp_Object Vemacs_minor_version;