comparison src/emacs.c @ 388:aabb7f5b1c81 r21-2-9

Import from CVS: tag r21-2-9
author cvs
date Mon, 13 Aug 2007 11:09:42 +0200
parents bbff43aa5eb7
children 7d59cb494b73
comparison
equal deleted inserted replaced
387:f892a9d0bb8d 388:aabb7f5b1c81
137 137
138 Lisp_Object Vemacs_program_name, Vemacs_program_version; 138 Lisp_Object Vemacs_program_name, Vemacs_program_version;
139 Lisp_Object Vexec_path; 139 Lisp_Object Vexec_path;
140 Lisp_Object Vexec_directory, Vconfigure_exec_directory; 140 Lisp_Object Vexec_directory, Vconfigure_exec_directory;
141 Lisp_Object Vlisp_directory, Vconfigure_lisp_directory; 141 Lisp_Object Vlisp_directory, Vconfigure_lisp_directory;
142 Lisp_Object Vmodule_directory, Vconfigure_module_directory;
143 Lisp_Object Vsite_module_directory, Vconfigure_site_module_directory;
142 Lisp_Object Vconfigure_package_path; 144 Lisp_Object Vconfigure_package_path;
143 Lisp_Object Vdata_directory, Vconfigure_data_directory; 145 Lisp_Object Vdata_directory, Vconfigure_data_directory;
144 Lisp_Object Vdoc_directory, Vconfigure_doc_directory; 146 Lisp_Object Vdoc_directory, Vconfigure_doc_directory;
145 Lisp_Object Vconfigure_lock_directory; 147 Lisp_Object Vconfigure_lock_directory;
146 Lisp_Object Vdata_directory_list; 148 Lisp_Object Vdata_directory_list;
198 200
199 int noninteractive1; 201 int noninteractive1;
200 202
201 /* Nonzero means don't perform site-lisp searches at startup */ 203 /* Nonzero means don't perform site-lisp searches at startup */
202 int inhibit_site_lisp; 204 int inhibit_site_lisp;
205
206 /* Nonzero means don't perform site-modules searches at startup */
207 int inhibit_site_modules;
203 208
204 /* Nonzero means don't respect early packages at startup */ 209 /* Nonzero means don't respect early packages at startup */
205 int inhibit_early_packages; 210 int inhibit_early_packages;
206 211
207 /* Nonzero means don't load package autoloads at startup */ 212 /* Nonzero means don't load package autoloads at startup */
703 6, NULL, &skip_args)) 708 6, NULL, &skip_args))
704 { 709 {
705 inhibit_early_packages = 1; 710 inhibit_early_packages = 1;
706 skip_args--; 711 skip_args--;
707 } 712 }
713 #ifdef HAVE_SHLIB
714 if (argmatch (argv, argc, "-no-site-modules", "--no-site-modules",
715 9, NULL, &skip_args))
716 {
717 inhibit_site_modules = 1;
718 skip_args--;
719 }
720 #else
721 inhibit_site_modules = 1;
722 #endif
708 if (argmatch (argv, argc, "-vanilla", "--vanilla", 723 if (argmatch (argv, argc, "-vanilla", "--vanilla",
709 7, NULL, &skip_args)) 724 7, NULL, &skip_args))
710 { 725 {
711 inhibit_early_packages = 1; 726 inhibit_early_packages = 1;
712 skip_args--; 727 skip_args--;
889 syms_of_device (); 904 syms_of_device ();
890 #ifdef HAVE_DIALOGS 905 #ifdef HAVE_DIALOGS
891 syms_of_dialog (); 906 syms_of_dialog ();
892 #endif 907 #endif
893 syms_of_dired (); 908 syms_of_dired ();
894 #ifdef HAVE_SHLIB
895 syms_of_dll ();
896 #endif
897 syms_of_doc (); 909 syms_of_doc ();
898 syms_of_editfns (); 910 syms_of_editfns ();
899 syms_of_elhash (); 911 syms_of_elhash ();
900 syms_of_emacs (); 912 syms_of_emacs ();
901 syms_of_eval (); 913 syms_of_eval ();
936 #endif 948 #endif
937 #ifdef HAVE_MENUBARS 949 #ifdef HAVE_MENUBARS
938 syms_of_menubar (); 950 syms_of_menubar ();
939 #endif 951 #endif
940 syms_of_minibuf (); 952 syms_of_minibuf ();
953 #ifdef HAVE_SHLIB
954 syms_of_module ();
955 #endif
941 syms_of_objects (); 956 syms_of_objects ();
942 syms_of_print (); 957 syms_of_print ();
943 #if !defined (NO_SUBPROCESSES) 958 #if !defined (NO_SUBPROCESSES)
944 syms_of_process (); 959 syms_of_process ();
945 #ifdef HAVE_WIN32_PROCESSES 960 #ifdef HAVE_WIN32_PROCESSES
1326 #endif 1341 #endif
1327 #ifdef HAVE_MENUBARS 1342 #ifdef HAVE_MENUBARS
1328 vars_of_menubar (); 1343 vars_of_menubar ();
1329 #endif 1344 #endif
1330 vars_of_minibuf (); 1345 vars_of_minibuf ();
1346 #ifdef HAVE_SHLIB
1347 vars_of_module ();
1348 #endif
1331 vars_of_objects (); 1349 vars_of_objects ();
1332 vars_of_print (); 1350 vars_of_print ();
1333 1351
1334 #ifndef NO_SUBPROCESSES 1352 #ifndef NO_SUBPROCESSES
1335 vars_of_process (); 1353 vars_of_process ();
2828 */ ); 2846 */ );
2829 #ifdef INHIBIT_SITE_LISP 2847 #ifdef INHIBIT_SITE_LISP
2830 inhibit_site_lisp = 1; 2848 inhibit_site_lisp = 1;
2831 #endif 2849 #endif
2832 2850
2851 DEFVAR_BOOL ("inhibit-site-modules", &inhibit_site_modules /*
2852 Set to non-nil when site-modules should not be searched at startup.
2853 */ );
2854 #ifdef INHIBIT_SITE_MODULES
2855 inhibit_site_modules = 1;
2856 #endif
2857
2833 DEFVAR_INT ("emacs-priority", &emacs_priority /* 2858 DEFVAR_INT ("emacs-priority", &emacs_priority /*
2834 Priority for XEmacs to run at. 2859 Priority for XEmacs to run at.
2835 This value is effective only if set before XEmacs is dumped, 2860 This value is effective only if set before XEmacs is dumped,
2836 and only if the XEmacs executable is installed with setuid to permit 2861 and only if the XEmacs executable is installed with setuid to permit
2837 it to change priority. (XEmacs sets its uid back to the real uid.) 2862 it to change priority. (XEmacs sets its uid back to the real uid.)
2939 (build_string ((char *) PATH_LOADSEARCH)); 2964 (build_string ((char *) PATH_LOADSEARCH));
2940 #else 2965 #else
2941 Vconfigure_lisp_directory = Qnil; 2966 Vconfigure_lisp_directory = Qnil;
2942 #endif 2967 #endif
2943 2968
2969 DEFVAR_LISP ("module-directory", &Vmodule_directory /*
2970 *Directory of core dynamic modules that come with XEmacs.
2971 */ );
2972 Vmodule_directory = Qnil;
2973
2974 DEFVAR_LISP ("configure-module-directory", &Vconfigure_module_directory /*
2975 For internal use by the build procedure only.
2976 configure's idea of what MODULE-DIRECTORY will be.
2977 */ );
2978 #ifdef PATH_MODULESEARCH
2979 Vconfigure_module_directory = Ffile_name_as_directory
2980 (build_string ((char *) PATH_MODULESEARCH));
2981 #else
2982 Vconfigure_module_directory = Qnil;
2983 #endif
2984
2944 DEFVAR_LISP ("configure-package-path", &Vconfigure_package_path /* 2985 DEFVAR_LISP ("configure-package-path", &Vconfigure_package_path /*
2945 For internal use by the build procedure only. 2986 For internal use by the build procedure only.
2946 configure's idea of what the package path will be. 2987 configure's idea of what the package path will be.
2947 */ ); 2988 */ );
2948 #ifdef PATH_PACKAGEPATH 2989 #ifdef PATH_PACKAGEPATH
3001 #ifdef PATH_SITE 3042 #ifdef PATH_SITE
3002 Vconfigure_site_directory = Ffile_name_as_directory 3043 Vconfigure_site_directory = Ffile_name_as_directory
3003 (build_string ((char *) PATH_SITE)); 3044 (build_string ((char *) PATH_SITE));
3004 #else 3045 #else
3005 Vconfigure_site_directory = Qnil; 3046 Vconfigure_site_directory = Qnil;
3047 #endif
3048
3049 DEFVAR_LISP ("site-module-directory", &Vsite_module_directory /*
3050 *Directory of site-specific loadable modules that come with XEmacs.
3051 */ );
3052 Vsite_module_directory = Qnil;
3053
3054 DEFVAR_LISP ("configure-site-module-directory", &Vconfigure_site_module_directory /*
3055 For internal use by the build procedure only.
3056 configure's idea of what SITE-DIRECTORY will be.
3057 */ );
3058 #ifdef PATH_SITE_MODULES
3059 Vconfigure_site_module_directory = Ffile_name_as_directory
3060 (build_string ((char *) PATH_SITE_MODULES));
3061 #else
3062 Vconfigure_site_module_directory = Qnil;
3006 #endif 3063 #endif
3007 3064
3008 DEFVAR_LISP ("doc-directory", &Vdoc_directory /* 3065 DEFVAR_LISP ("doc-directory", &Vdoc_directory /*
3009 *Directory containing the DOC file that comes with XEmacs. 3066 *Directory containing the DOC file that comes with XEmacs.
3010 This is usually the same as exec-directory. 3067 This is usually the same as exec-directory.