xemacs-beta: src/emacs.c comparison

comparison src/emacs.c @ 444:576fb035e263 r21-2-37

Import from CVS: tag r21-2-37

author	cvs
date	Mon, 13 Aug 2007 11:36:19 +0200
parents	abe6d1db359e
children	1ccc32a20af4

comparison

equal deleted inserted replaced

-:a8296e22da4e
+:576fb035e263
 /* Nonzero means print debug information about path searching */
 int debug_paths;
 /* Save argv and argc.  */
-static Extbyte **initial_argv;
+static Extbyte **initial_argv;	/* #### currently unused */
-static int initial_argc;
+static int initial_argc;	/* #### currently unused */
 static void sort_args (int argc, char **argv);
 Lisp_Object Qkill_emacs_hook;
 Lisp_Object Qsave_buffers_kill_emacs;
 vars_of_events ();
 vars_of_extents ();
 vars_of_faces ();
 vars_of_fileio ();
+#ifdef CLASH_DETECTION
+vars_of_filelock ();
+#endif
 vars_of_floatfns ();
 vars_of_font_lock ();
 vars_of_frame ();
 vars_of_glyphs ();
 vars_of_glyphs_eimage ();
 Remember to set `command-line-processed' to nil before dumping
 if you want the dumped XEmacs to process its command line
 and announce itself normally when it is run.
 */
-(intoname, symname))
+(filename, symfile))
 {
 /* This function can GC */
 struct gcpro gcpro1, gcpro2;
 int opurify;
-GCPRO2 (intoname, symname);
+GCPRO2 (filename, symfile);
 #ifdef FREE_CHECKING
 Freally_free (Qnil);
 /* When we're dumping, we can't use the debugging free() */
 disable_free_hook ();
 #endif
-CHECK_STRING (intoname);
+CHECK_STRING (filename);
-intoname = Fexpand_file_name (intoname, Qnil);
+filename = Fexpand_file_name (filename, Qnil);
-if (!NILP (symname))
+if (!NILP (symfile))
 {
-CHECK_STRING (symname);
+CHECK_STRING (symfile);
-if (XSTRING_LENGTH (symname) > 0)
+if (XSTRING_LENGTH (symfile) > 0)
-	symname = Fexpand_file_name (symname, Qnil);
+	symfile = Fexpand_file_name (symfile, Qnil);
 else
-	symname = Qnil;
+	symfile = Qnil;
 }
 opurify = purify_flag;
 purify_flag = 0;
 #endif
 UNGCPRO;
 {
-char *intoname_ext;
+char *filename_ext;
-char *symname_ext;
+char *symfile_ext;
-LISP_STRING_TO_EXTERNAL (intoname, intoname_ext, Qfile_name);
+LISP_STRING_TO_EXTERNAL (filename, filename_ext, Qfile_name);
-if (STRINGP (symname))
+if (STRINGP (symfile))
-LISP_STRING_TO_EXTERNAL (symname, symname_ext, Qfile_name);
+LISP_STRING_TO_EXTERNAL (symfile, symfile_ext, Qfile_name);
 else
-symname_ext = 0;
+symfile_ext = 0;
 garbage_collect_1 ();
 #ifdef PDUMP
 pdump ();
 be performed at the actual time that the system call is made.
 It's a whole lot easier to do the conversion here than to
 modify all the unexec routines to ensure that filename
 conversion is applied everywhere.  Don't worry about memory
 leakage because this call only happens once. */
-unexec (intoname_ext, symname_ext, (uintptr_t) my_edata, 0, 0);
+unexec (filename_ext, symfile_ext, (uintptr_t) my_edata, 0, 0);
 #ifdef DOUG_LEA_MALLOC
 free (malloc_state_ptr);
 #endif
 #endif /* not PDUMP */
 }
 */ );
 Vemacs_program_name = build_string ((char *) PATH_PROGNAME);
 DEFVAR_LISP ("emacs-program-version", &Vemacs_program_version /*
 *Version of the Emacs variant.
-This typically has the form XX.XX[-bXX].
+This typically has the form NN.NN-bNN.
 This is mainly meant for use in path searching.
 */ );
 Vemacs_program_version = build_string ((char *) PATH_VERSION);
 DEFVAR_LISP ("exec-path", &Vexec_path /*
 */ );
 Vexec_directory = Qnil;
 DEFVAR_LISP ("configure-exec-directory", &Vconfigure_exec_directory /*
 For internal use by the build procedure only.
-configure's idea of what EXEC-DIRECTORY will be.
+configure's idea of what `exec-directory' will be.
 */ );
 #ifdef PATH_EXEC
 Vconfigure_exec_directory = Ffile_name_as_directory
 (build_string ((char *) PATH_EXEC));
 #else
 */ );
 Vlisp_directory = Qnil;
 DEFVAR_LISP ("configure-lisp-directory", &Vconfigure_lisp_directory /*
 For internal use by the build procedure only.
-configure's idea of what LISP-DIRECTORY will be.
+configure's idea of what `lisp-directory' will be.
 */ );
 #ifdef PATH_LOADSEARCH
 Vconfigure_lisp_directory = Ffile_name_as_directory
 (build_string ((char *) PATH_LOADSEARCH));
 #else
 */ );
 Vmodule_directory = Qnil;
 DEFVAR_LISP ("configure-module-directory", &Vconfigure_module_directory /*
 For internal use by the build procedure only.
-configure's idea of what MODULE-DIRECTORY will be.
+configure's idea of what `module-directory' will be.
 */ );
 #ifdef PATH_MODULESEARCH
 Vconfigure_module_directory = Ffile_name_as_directory
 (build_string ((char *) PATH_MODULESEARCH));
 #else
 */ );
 Vdata_directory = Qnil;
 DEFVAR_LISP ("configure-data-directory", &Vconfigure_data_directory /*
 For internal use by the build procedure only.
-configure's idea of what DATA-DIRECTORY will be.
+configure's idea of what `data-directory' will be.
 */ );
 #ifdef PATH_DATA
 Vconfigure_data_directory = Ffile_name_as_directory
 (build_string ((char *) PATH_DATA));
 #else
 */ );
 Vsite_directory = Qnil;
 DEFVAR_LISP ("configure-site-directory", &Vconfigure_site_directory /*
 For internal use by the build procedure only.
-configure's idea of what SITE-DIRECTORY will be.
+configure's idea of what `site-directory' will be.
 */ );
 #ifdef PATH_SITE
 Vconfigure_site_directory = Ffile_name_as_directory
 (build_string ((char *) PATH_SITE));
 #else
 */ );
 Vsite_module_directory = Qnil;
 DEFVAR_LISP ("configure-site-module-directory", &Vconfigure_site_module_directory /*
 For internal use by the build procedure only.
-configure's idea of what SITE-DIRECTORY will be.
+configure's idea of what `site-directory' will be.
 */ );
 #ifdef PATH_SITE_MODULES
 Vconfigure_site_module_directory = Ffile_name_as_directory
 (build_string ((char *) PATH_SITE_MODULES));
 #else
 Vconfigure_site_module_directory = Qnil;
 #endif
 DEFVAR_LISP ("doc-directory", &Vdoc_directory /*
 *Directory containing the DOC file that comes with XEmacs.
-This is usually the same as exec-directory.
+This is usually the same as `exec-directory'.
 */ );
 Vdoc_directory = Qnil;
 DEFVAR_LISP ("configure-doc-directory", &Vconfigure_doc_directory /*
 For internal use by the build procedure only.
-configure's idea of what DOC-DIRECTORY will be.
+configure's idea of what `doc-directory' will be.
 */ );
 #ifdef PATH_DOC
 Vconfigure_doc_directory = Ffile_name_as_directory
 (build_string ((char *) PATH_DOC));
 #else
 Vconfigure_doc_directory = Qnil;
 #endif
 DEFVAR_LISP ("configure-exec-prefix-directory", &Vconfigure_exec_prefix_directory /*
 For internal use by the build procedure only.
-configure's idea of what EXEC-PREFIX-DIRECTORY will be.
+configure's idea of what `exec-prefix-directory' will be.
 */ );
 #ifdef PATH_EXEC_PREFIX
 Vconfigure_exec_prefix_directory = Ffile_name_as_directory
 (build_string ((char *) PATH_EXEC_PREFIX));
 #else
 Vconfigure_exec_prefix_directory = Qnil;
 #endif
 DEFVAR_LISP ("configure-prefix-directory", &Vconfigure_prefix_directory /*
 For internal use by the build procedure only.
-configure's idea of what PREFIX-DIRECTORY will be.
+configure's idea of what `prefix-directory' will be.
 */ );
 #ifdef PATH_PREFIX
 Vconfigure_prefix_directory = Ffile_name_as_directory
 (build_string ((char *) PATH_PREFIX));
 #else

Mercurial > hg > xemacs-beta

comparison src/emacs.c @ 444:576fb035e263 r21-2-37