xemacs-beta: src/emacs.c comparison

comparison src/emacs.c @ 5125:b5df3737028a ben-lisp-object

merge

author	Ben Wing <ben@xemacs.org>
date	Wed, 24 Feb 2010 01:58:04 -0600
parents	e0db3c197671 838630c0734f
children	2a462149bd6a

comparison

equal deleted inserted replaced

-:623d57b7fbe8
+:b5df3737028a
 /* XEmacs -- Fully extensible Emacs, running on Unix and other platforms.
 Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994
 Free Software Foundation, Inc.
 Copyright (C) 1995 Sun Microsystems, Inc.
-Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Ben Wing.
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2010 Ben Wing.
 This file is part of XEmacs.
 XEmacs is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 You should have received a copy of the GNU General Public License
 along with XEmacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+the Free Software Foundation, Inc., 51 Franklin St - Fifth Floor,
-Boston, MA 02111-1307, USA.  */
+Boston, MA 02111-1301, USA.  */
 /* Synched up with: Mule 2.0, FSF 19.28. */
 /* This file has been Mule-ized, Ben Wing, 10-7-04. */
 redisplay.c (various scattered)
 regex.c (various scattered)
 sysdep.c (maybe; wait_for_termination)
 unexec.c
 unicode.c
-xgccache.c (a bit)
+gccache-x.c (a bit)
 #### review .h files; write a perl program to look for long comments
 throughout the files, ignoring stuff inside of DEFUN's.
 #### elsewhere?
 /* Nonzero means we're going down, so we better not run any hooks
 or do other non-essential stuff. */
 int preparing_for_armageddon;
 /* Nonzero means we're in an unstable situation and need to skip
-i18n conversions and such.  During printing we check for this,
+internal->external conversions, QUIT checking and such.  This gets set
-and during conversion we abort if we see this. */
+during early startup, during shutdown, and when debug printing
+(i.e. called from a debugger such as gdb to print Lisp objects or
+backtraces).  During printing we check for this, and during conversion
+we abort if we see this. */
 int inhibit_non_essential_conversion_operations;
 static JMP_BUF run_temacs_catch;
 static int run_temacs_argc;
 	      Lisp_Object fullpath;
 	      full_exe_path = mswindows_get_module_file_name ();
 	      assert (full_exe_path);
 	      fullpath = build_tstr_string (full_exe_path);
-	      xfree (full_exe_path, Extbyte *);
+	      xfree (full_exe_path);
 	      result = Fcons (fullpath, result);
 	    }
 	  else
 #endif
 	    result = Fcons (build_wext_string (argv[i],
 for (i = 0, next = argv_list; i < n; i++, next = XCDR (next))
 {
 CHECK_STRING (XCAR (next));
-LISP_STRING_TO_EXTERNAL_MALLOC (XCAR (next), (*argv) [i],
+(*argv)[i] =
-				      Qcommand_argument_encoding);
+	(Wexttext *) LISP_STRING_TO_EXTERNAL_MALLOC
+	(XCAR (next), Qcommand_argument_encoding);
 }
 (*argv) [n] = 0;
 *argc = i;
 }
 {
 int elt = 0;
 while (argv[elt])
 {
-xfree (argv[elt], Wexttext *);
+xfree (argv[elt]);
 elt++;
 }
-xfree (argv, Wexttext **);
+xfree (argv);
 }
 static void
 init_cmdargs (int argc, Wexttext **argv, int skip_args)
 {
 init_free_hook ();
 #endif
 #define SHEBANG_PROGNAME_LENGTH                                         \
 (int)((sizeof (WEXTSTRING (SHEBANG_PROGNAME)) - sizeof (WEXTSTRING (""))))
-#define SHEBANG_EXE_PROGNAME_LENGTH                                     \
+#define SHEBANG_EXE_PROGNAME_LENGTH			\
-(int)(sizeof (WEXTSTRING (SHEBANG_PROGNAME) WEXTSTRING(".exe"))       \
+(int)(sizeof (WEXTSTRING (SHEBANG_PROGNAME) WEXTSTRING (".exe"))	\
 - sizeof (WEXTSTRING ("")))
 {
 int progname_len = wext_strlen (argv[0]);
 if (progname_len >= SHEBANG_PROGNAME_LENGTH)
 	  {
 	    Wexttext **newarr = alloca_array (Wexttext *, argc + 2);
 	    int j;
 	    newarr[0] = argv[0];
-	    newarr[1] = WEXTSTRING ("--script");
+	    newarr[1] = (Wexttext *) WEXTSTRING ("--script");
 	    for (j = 1; j < argc; ++j)
 	      {
 		newarr[j + 1] = argv[j];
 	      }
 	    argv = newarr;
 	  Wexttext **new_ = xnew_array (Wexttext *, argc + 2);
 	  int j;
 	  for (j = 0; j < count_before + 1; j++)
 	    new_[j] = argv[j];
-	  new_[count_before + 1] = WEXTSTRING ("-d");
+	  new_[count_before + 1] = (Wexttext *) WEXTSTRING ("-d");
 	  new_[count_before + 2] = dpy;
 	  for (j = count_before + 2; j <argc; j++)
 	    new_[j + 1] = argv[j];
 	  argv = new_;
 	  argc++;
 	}
 /* Change --display to -d, when its arg is separate.  */
 else if (dpy != 0 && skip_args > count_before
 	       && argv[count_before + 1][1] == '-')
-	argv[count_before + 1] = WEXTSTRING ("-d");
+	argv[count_before + 1] = (Wexttext *) WEXTSTRING ("-d");
 /* Don't actually discard this arg.  */
 skip_args = count_before;
 #endif /* HAVE_X_WINDOWS */
 }
 #ifdef XIM_XLIB
 syms_of_input_method_xlib ();
 #endif
 #endif /* HAVE_XIM */
-#ifdef USE_XFT
+#ifdef HAVE_XFT
 syms_of_font_mgr();
 #endif
 #endif /* HAVE_X_WINDOWS */
 reinit_symbols_early ();
 #ifndef NEW_GC
 reinit_opaque_early ();
 #endif /* not NEW_GC */
 reinit_eistring_early ();
+#ifdef WITH_NUMBER_TYPES
+reinit_vars_of_number ();
+#endif
 reinit_console_type_create_stream ();
 #ifdef HAVE_TTY
 reinit_console_type_create_tty ();
 #endif
 	    the symbol isn't referenced anywhere else in the initialization
 	    code
 	 -- Fset() on a symbol that is unbound
 	 -- Any of the object-creating functions in alloc.c: e.g.
 	    - make_string()
-	    - build_intstring()
+	    - build_istring()
-	    - build_string()
+	    - build_cistring()
+	    - build_ascstring()
 	    - make_vector()
 	    - make_int()
 	    - make_char()
 	    - make_extent()
 	    - ALLOC_LISP_OBJECT()
 #endif
 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS)
 vars_of_gui_x ();
 #endif
-#ifdef USE_XFT
+#ifdef HAVE_XFT
 vars_of_font_mgr ();
 #endif
 #endif /* HAVE_X_WINDOWS */
 )
 {
 /* Now do additional vars_of_*() initialization that happens both
 	 at dump time and after pdump load. */
 reinit_vars_of_buffer ();
+reinit_vars_of_bytecode ();
 reinit_vars_of_console ();
 #ifdef DEBUG_XEMACS
 reinit_vars_of_debug ();
 #endif
 reinit_vars_of_device ();
 #endif
 reinit_vars_of_select_x ();
 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS)
 reinit_vars_of_gui_x ();
 #endif
-#ifdef USE_XFT
+#ifdef HAVE_XFT
 reinit_vars_of_font_mgr ();
 #endif
 #endif /* HAVE_X_WINDOWS */
 #ifdef MULE
 	 possible that it could get changed to require being a
 	 complex_vars_of_(), for example if a charset appears anywhere,
 	 then we suddenly have dependence on the previous call. */
 complex_vars_of_file_coding ();
 #ifdef WIN32_ANY
+/* Define MS-Windows Unicode coding systems */
 complex_vars_of_intl_win32 ();
 #endif
+/* Define UTF-8 coding system */
+complex_vars_of_unicode ();
 /* At this point we should be able to do conversion operations.
 We have initialized things to the point that we can create Lisp
 objects and we have defined the basic coding systems (in the
 just-previous complex-vars calls).  We will in fact do conversion
 	 quite soon, e.g. in complex_vars_of_glyphs_x(). */
 inhibit_non_essential_conversion_operations = 0;
-#ifdef USE_XFT
+#ifdef HAVE_XFT
 /* This uses coding systems.  Must be done before faces are init'ed. */
 /* not in xft reloaded #3 */
 complex_vars_of_font_mgr ();
 #endif
 {
 Vinvocation_name = Fcar (Vcommand_line_args);
 if (XSTRING_DATA (Vinvocation_name)[0] == '-')
 	{
 	  /* XEmacs as a login shell, oh goody! */
-	  Vinvocation_name = build_intstring (egetenv ("SHELL"));
+	  Vinvocation_name = build_istring (egetenv ("SHELL"));
 	}
 Vinvocation_directory = Vinvocation_name;
 if (!NILP (Ffile_name_directory (Vinvocation_name)))
 	{
 for (i = 0; i < options[best]; i++)
 	argv[best + i + 1] = 0;
 }
 memcpy (argv, new_argv, sizeof (Wexttext *) * argc);
-xfree (new_argv, Wexttext **);
+xfree (new_argv);
-xfree (options, int *);
+xfree (options);
-xfree (priority, int *);
+xfree (priority);
 }
 DEFUN ("running-temacs-p", Frunning_temacs_p, 0, 0, 0, /*
 True if running temacs.  This means we are in the dumping stage.
 This is false during normal execution of the `xemacs' program, and
 invalid_operation ("I've lost my temacs-hood", Qunbound);
 run_temacs_argc = nargs + 1;
 run_temacs_argv = xnew_array (Wexttext *, nargs + 2);
-LISP_STRING_TO_EXTERNAL_MALLOC (Fcar (Vcommand_line_args),
+run_temacs_argv[0] =
-				  run_temacs_argv[0],
+(Wexttext *) LISP_STRING_TO_EXTERNAL_MALLOC (Fcar (Vcommand_line_args),
-				  Qcommand_argument_encoding);
+						 Qcommand_argument_encoding);
 for (i = 0; i < nargs; i++)
 {
 CHECK_STRING (args[i]);
-LISP_STRING_TO_EXTERNAL_MALLOC (args[i], run_temacs_argv[i + 1],
+run_temacs_argv[i + 1] =
-				      Qcommand_argument_encoding);
+	(Wexttext *)
+	LISP_STRING_TO_EXTERNAL_MALLOC (args[i], Qcommand_argument_encoding);
 }
 run_temacs_argv[nargs + 1] = 0;
 catchlist = NULL; /* Important!  Otherwise free_cons() calls in
 		       condition_case_unwind() may lead to GC death. */
 #else
 {
 Extbyte *filename_ext;
 Extbyte *symfile_ext;
-LISP_STRING_TO_EXTERNAL (filename, filename_ext, Qfile_name);
+LISP_PATHNAME_CONVERT_OUT (filename, filename_ext);
 if (STRINGP (symfile))
-LISP_STRING_TO_EXTERNAL (symfile, symfile_ext, Qfile_name);
+LISP_PATHNAME_CONVERT_OUT (symfile, symfile_ext);
 else
 symfile_ext = 0;
 # ifdef DOUG_LEA_MALLOC
 malloc_state_ptr = malloc_get_state ();
 /************************************************************************/
 /*                  exiting XEmacs (intended or not)                    */
 /************************************************************************/
+/* Do we need to pause with a message box so that messages can be read
+at shutdown?  We do this is we have support for native Windows frames
+and if we are native Windows.  The first part is because only when compiled
+for native Windows frames do we have Fmswindows_message_box(), and
+the second part is because we don't want to do this under Cygwin, where
+we have a Unix-like environment and a working stderr where the messages
+go.  The two conditions sound somewhat redundant (maybe we could just
+use the second?) but they aren't completely: Theoretically (maybe with
+MinGW?) we could imagine compiling under native Windows as the OS
+but e.g. targetting only X Windows as the window system. --ben */
+#if defined (HAVE_MS_WINDOWS) && defined (WIN32_NATIVE)
+# define NEED_WINDOWS_MESSAGE_PAUSE
+#endif
 /*
 Info on intended/unintended exits:
 (Info-goto-node "(internals)Exiting")
 #ifdef WIN32_ANY
 /* Return whether all bytes in the specified memory block can be read. */
 int
-debug_can_access_memory (void *ptr, Bytecount len)
+debug_can_access_memory (const void *ptr, Bytecount len)
 {
 return !IsBadReadPtr (ptr, len);
 }
 #else /* !WIN32_ANY */
 EMACS_REESTABLISH_SIGNAL (signum, debug_memory_error);
 EMACS_UNBLOCK_SIGNAL (signum);
 LONGJMP (memory_error_jump, 1);
 }
+/* Used in debug_can_access_memory().  Made into a global, externally
+accessible variable to make absolutely sure that no compiler will
+optimize away the memory-read function in debug_can_access_memory();
+see comments there. */
+volatile int dcam_saveval;
 /* Return whether all bytes in the specified memory block can be read. */
 int
-debug_can_access_memory (void *ptr, Bytecount len)
+debug_can_access_memory (const void *ptr, Bytecount len)
 {
 /* Use volatile to protect variables from being clobbered by longjmp. */
 SIGTYPE (*volatile old_sigbus) (int);
 SIGTYPE (*volatile old_sigsegv) (int);
 volatile int old_errno = errno;
 volatile int retval = 1;
+assert (len > 0);
 if (!SETJMP (memory_error_jump))
 {
 old_sigbus =
 	(SIGTYPE (*) (int)) EMACS_SIGNAL (SIGBUS, debug_memory_error);
 old_sigsegv =
 	(SIGTYPE (*) (int)) EMACS_SIGNAL (SIGSEGV, debug_memory_error);
+/* We could just do memcmp (ptr, ptr, len), but we want to avoid any
+	 possibility that a super-optimizing compiler might optimize away such
+	 a call by concluding that its result is always 1. */
 if (len > 1)
-	/* If we can, try to avoid problems with super-optimizing compilers
+	/* Instead, if length is > 1, do off-by-one comparison.
-	   that might decide that memcmp (ptr, ptr, len) can be optimized
+We save the value somewhere that is externally accessible to
-	   away since its result is always 1. */
+make absolutely sure that a compiler won't optimize away the
-	memcmp (ptr, (Rawbyte *) ptr + 1, len - 1);
+call by concluding that the return value isn't really used.
+*/
+	dcam_saveval = memcmp (ptr, (Rawbyte *) ptr + 1, len - 1);
 else
-	memcmp (ptr, ptr, len);
+	{
+	  /* We can't do the off-by-one trick with only one byte, so instead,
+we compare to a fixed-sized buffer. */
+	  Rawbyte randval[1];
+	  randval[0] = 0;
+	  dcam_saveval = memcmp (randval, ptr, len);
+	}
 }
 else
 retval = 0;
 EMACS_SIGNAL (SIGBUS, old_sigbus);
 EMACS_SIGNAL (SIGSEGV, old_sigsegv);
 dont_check_for_quit = 1;
 Vinhibit_quit = Qt;
 Vquit_flag = Qnil;
 }
-#ifdef HAVE_MS_WINDOWS
+#ifdef NEED_WINDOWS_MESSAGE_PAUSE
 static void
 pause_so_user_can_read_messages (int allow_further)
 {
 static int already_paused;
 	}
 }
 UNGCPRO;
-#ifdef HAVE_MS_WINDOWS
+#ifdef NEED_WINDOWS_MESSAGE_PAUSE
 pause_so_user_can_read_messages (1);
 #endif
 shut_down_emacs (0, STRINGP (arg) ? arg : Qnil, 0);
 popped up or somewhere else inside of an internal modal loop, we will
 get wedged when we output the "pause". (It seems that the two modal
 loops will fight each other and the return key will never be passed to
 the "pause" handler so that XEmacs's GPF handler can return, resignal
 the GPF, and properly go into the debugger.) */
-#if defined (ERROR_CHECK_TYPES) || defined (ERROR_CHECK_TEXT) || defined (ERROR_CHECK_GC) || defined (ERROR_CHECK_STRUCTURES)
+#ifdef ERROR_CHECK_ANY
 #define USER_IS_DEVELOPING_XEMACS
 #endif
 /* Handle bus errors, illegal instruction, etc: actual implementation. */
 sprintf (buf, "%s %d >&2", pstack, (int) getpid());
 system (buf);
 }
 }
 # endif
-#if defined (HAVE_MS_WINDOWS) && !defined (USER_IS_DEVELOPING_XEMACS)
+#if defined (NEED_WINDOWS_MESSAGE_PAUSE) && !defined (USER_IS_DEVELOPING_XEMACS)
 pause_so_user_can_read_messages (0);
 #endif
 }
 }
 return;
 /* We are extremely paranoid so we sensibly deal with recursive
 assertion failures. */
 in_assert_failed++;
-inhibit_non_essential_conversion_operations = 1;
+inhibit_non_essential_conversion_operations++;
 if (in_assert_failed >= 4)
 _exit (-1);
 else if (in_assert_failed == 3)
 {
 	             0); */
 #else
 really_abort ();
 #endif /* defined (_MSC_VER) || defined (CYGWIN) */
 #endif /* !defined (ASSERTIONS_DONT_ABORT) */
-inhibit_non_essential_conversion_operations = 0;
+inhibit_non_essential_conversion_operations--;
-in_assert_failed = 0;
+in_assert_failed--;
 }
 /* -------------------------------------- */
 /*        low-memory notification         */
 /* -------------------------------------- */
 # define EMACS_CONFIGURATION "UNKNOWN"
 #endif
 DEFVAR_LISP ("system-configuration", &Vsystem_configuration /*
 String naming the configuration XEmacs was built for.
 */ );
-Vsystem_configuration = build_string (EMACS_CONFIGURATION);
+Vsystem_configuration = build_ascstring (EMACS_CONFIGURATION);
 #ifndef EMACS_CONFIG_OPTIONS
 # define EMACS_CONFIG_OPTIONS "UNKNOWN"
 #endif
 DEFVAR_LISP ("system-configuration-options", &Vsystem_configuration_options /*
 String containing the configuration options XEmacs was built with.
 */ );
-Vsystem_configuration_options = build_string (EMACS_CONFIG_OPTIONS);
+Vsystem_configuration_options = build_ascstring (EMACS_CONFIG_OPTIONS);
 DEFVAR_LISP ("emacs-major-version", &Vemacs_major_version /*
 Major version number of this version of Emacs, as an integer.
 Warning: this variable did not exist in Emacs versions earlier than:
 FSF Emacs:   19.23
 Codename of this version of Emacs (a string).
 */ );
 #ifndef XEMACS_CODENAME
 #define XEMACS_CODENAME "Noname"
 #endif
-Vxemacs_codename = build_string (XEMACS_CODENAME);
+Vxemacs_codename = build_ascstring (XEMACS_CODENAME);
 DEFVAR_LISP ("xemacs-extra-name", &Vxemacs_extra_name /*
 Arbitrary string to place in the version string after the codename.
 Appropriate surrounding whitespace will be added, but typically looks best
 A standard use is to indicate the topmost hash id of the Mercurial
 changeset from which XEmacs was compiled.  Developers may also use it
 to indicate particular branches, etc.
 */ );
 #ifdef XEMACS_EXTRA_NAME
-Vxemacs_extra_name = build_string (XEMACS_EXTRA_NAME);
+Vxemacs_extra_name = build_ascstring (XEMACS_EXTRA_NAME);
 #endif
 DEFVAR_LISP ("xemacs-release-date", &Vxemacs_release_date /*
 ISO 8601 format date string giving the date of latest release in series.
 is (implicitly) UTC.  Currently not included in the version string.
 */ );
 #ifndef XEMACS_RELEASE_DATE
 #define XEMACS_RELEASE_DATE "2005-02-18 (defaulted in emacs.c)"
 #endif
-Vxemacs_release_date = build_string (XEMACS_RELEASE_DATE);
+Vxemacs_release_date = build_ascstring (XEMACS_RELEASE_DATE);
 /* Lisp variables which contain command line flags.
 The portable dumper stomps on these; they must be saved and restored
 if they are processed before the call to pdump_load() in main_1().
 DEFVAR_LISP ("emacs-program-name", &Vemacs_program_name /*
 *Name of the Emacs variant.
 For example, this may be \"xemacs\" or \"infodock\".
 This is mainly meant for use in path searching.
 */ );
-Vemacs_program_name = build_ext_string (PATH_PROGNAME, Qfile_name);
+Vemacs_program_name = build_extstring (PATH_PROGNAME, Qfile_name);
 DEFVAR_LISP ("emacs-program-version", &Vemacs_program_version /*
 *Version of the Emacs variant.
 This typically has the form NN.NN-bNN.
 This is mainly meant for use in path searching.
 */ );
-Vemacs_program_version = build_ext_string (PATH_VERSION, Qfile_name);
+Vemacs_program_version = build_extstring (PATH_VERSION, Qfile_name);
 DEFVAR_LISP ("exec-path", &Vexec_path /*
 *List of directories to search programs to run in subprocesses.
 Each element is a string (directory name) or nil (try default directory).
 */ );
 For internal use by the build procedure only.
 configure's idea of what `exec-directory' will be.
 */ );
 #ifdef PATH_EXEC
 Vconfigure_exec_directory = Ffile_name_as_directory
-(build_ext_string (PATH_EXEC, Qfile_name));
+(build_extstring (PATH_EXEC, Qfile_name));
 #else
 Vconfigure_exec_directory = Qnil;
 #endif
 DEFVAR_LISP ("lisp-directory", &Vlisp_directory /*
 For internal use by the build procedure only.
 configure's idea of what `lisp-directory' will be.
 */ );
 #ifdef PATH_LOADSEARCH
 Vconfigure_lisp_directory = Ffile_name_as_directory
-(build_ext_string (PATH_LOADSEARCH, Qfile_name));
+(build_extstring (PATH_LOADSEARCH, Qfile_name));
 #else
 Vconfigure_lisp_directory = Qnil;
 #endif
 DEFVAR_LISP ("mule-lisp-directory", &Vmule_lisp_directory /*
 For internal use by the build procedure only.
 configure's idea of what `mule-lisp-directory' will be.
 */ );
 #ifdef PATH_MULELOADSEARCH
 Vconfigure_mule_lisp_directory = Ffile_name_as_directory
-(build_ext_string (PATH_MULELOADSEARCH, Qfile_name);
+(build_extstring (PATH_MULELOADSEARCH, Qfile_name);
 #else
 Vconfigure_mule_lisp_directory = Qnil;
 #endif
 DEFVAR_LISP ("module-directory", &Vmodule_directory /*
 For internal use by the build procedure only.
 configure's idea of what `module-directory' will be.
 */ );
 #ifdef PATH_MODULESEARCH
 Vconfigure_module_directory = Ffile_name_as_directory
-(build_ext_string (PATH_MODULESEARCH, Qfile_name));
+(build_extstring (PATH_MODULESEARCH, Qfile_name));
 #else
 Vconfigure_module_directory = Qnil;
 #endif
 DEFVAR_LISP ("configure-early-package-directories", &Vconfigure_early_package_directories /*
 For internal use by the build procedure only.
 configure's idea of what `data-directory' will be.
 */ );
 #ifdef PATH_DATA
 Vconfigure_data_directory = Ffile_name_as_directory
-(build_ext_string (PATH_DATA, Qfile_name));
+(build_extstring (PATH_DATA, Qfile_name));
 #else
 Vconfigure_data_directory = Qnil;
 #endif
 DEFVAR_LISP ("data-directory-list", &Vdata_directory_list /*
 For internal use by the build procedure only.
 configure's idea of what `site-directory' will be.
 */ );
 #ifdef PATH_SITE
 Vconfigure_site_directory = Ffile_name_as_directory
-(build_ext_string (PATH_SITE, Qfile_name));
+(build_extstring (PATH_SITE, Qfile_name));
 #else
 Vconfigure_site_directory = Qnil;
 #endif
 DEFVAR_LISP ("site-module-directory", &Vsite_module_directory /*
 For internal use by the build procedure only.
 configure's idea of what `site-directory' will be.
 */ );
 #ifdef PATH_SITE_MODULES
 Vconfigure_site_module_directory = Ffile_name_as_directory
-(build_ext_string (PATH_SITE_MODULES, Qfile_name));
+(build_extstring (PATH_SITE_MODULES, Qfile_name));
 #else
 Vconfigure_site_module_directory = Qnil;
 #endif
 DEFVAR_LISP ("doc-directory", &Vdoc_directory /*
 For internal use by the build procedure only.
 configure's idea of what `doc-directory' will be.
 */ );
 #ifdef PATH_DOC
 Vconfigure_doc_directory = Ffile_name_as_directory
-(build_ext_string (PATH_DOC, Qfile_name));
+(build_extstring (PATH_DOC, Qfile_name));
 #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.
 */ );
 #ifdef PATH_EXEC_PREFIX
 Vconfigure_exec_prefix_directory = Ffile_name_as_directory
-(build_ext_string (PATH_EXEC_PREFIX, Qfile_name));
+(build_extstring (PATH_EXEC_PREFIX, Qfile_name));
 #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.
 */ );
 #ifdef PATH_PREFIX
 Vconfigure_prefix_directory = Ffile_name_as_directory
-(build_ext_string (PATH_PREFIX, Qfile_name));
+(build_extstring (PATH_PREFIX, Qfile_name));
 #else
 Vconfigure_prefix_directory = Qnil;
 #endif
 DEFVAR_LISP ("configure-info-directory", &Vconfigure_info_directory /*
 Emacs's info files; the default value for Info-default-directory-list
 includes this.
 */ );
 #ifdef PATH_INFO
 Vconfigure_info_directory =
-Ffile_name_as_directory (build_ext_string (PATH_INFO, Qfile_name));
+Ffile_name_as_directory (build_extstring (PATH_INFO, Qfile_name));
 #else
 Vconfigure_info_directory = Qnil;
 #endif
 DEFVAR_LISP ("configure-info-path", &Vconfigure_info_path /*

Mercurial > hg > xemacs-beta

comparison src/emacs.c @ 5125:b5df3737028a ben-lisp-object