21.4.14 "Reasonable Discussion".

[chise/xemacs-chise.git] / src / emacs.c

diff --git a/src/emacs.c b/src/emacs.c
index 417e022..ea67ffc 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -3,7 +3,6 @@
    Free Software Foundation, Inc.
    Copyright (C) 1995 Sun Microsystems, Inc.
    Copyright (C) 2000, 2002 Ben Wing.
-   Copyright (C) 2000,2002 MORIOKA Tomohiko.
 
 This file is part of XEmacs.
 
@@ -181,6 +180,10 @@ version 18.59 released October 31, 1992.
 #include "sysfile.h"
 #include "systime.h"
 
+#ifdef CYGWIN
+#include "syswindows.h"
+#endif
+
 #ifdef PDUMP
 #include "dumper.h"
 #endif
@@ -289,7 +292,6 @@ Lisp_Object Vexec_path;
 Lisp_Object Vexec_directory, Vconfigure_exec_directory;
 Lisp_Object Vlisp_directory, Vconfigure_lisp_directory;
 Lisp_Object Vmule_lisp_directory, Vconfigure_mule_lisp_directory;
-Lisp_Object Vutf_2000_lisp_directory, Vconfigure_utf_2000_lisp_directory;
 Lisp_Object Vmodule_directory, Vconfigure_module_directory;
 Lisp_Object Vsite_module_directory, Vconfigure_site_module_directory;
 Lisp_Object Vconfigure_package_path;
@@ -2911,7 +2913,8 @@ voodoo_free_hook (void *mem)
   /* Disable all calls to free() when XEmacs is exiting and it doesn't */
   /* matter. */
   __free_hook =
-#ifdef __GNUC__ /* prototype of __free_hook varies with glibc version */
+#if defined __GNUC__ || defined __INTEL_COMPILER
+/* prototype of __free_hook varies with glibc version */
     (__typeof__ (__free_hook))
 #endif
     voodoo_free_hook;
@@ -2985,7 +2988,8 @@ all of which are called before XEmacs is actually killed.
 
 #if defined(GNU_MALLOC)
   __free_hook =
-#ifdef __GNUC__ /* prototype of __free_hook varies with glibc version */
+#if defined __GNUC__ || defined __INTEL_COMPILER
+/* prototype of __free_hook varies with glibc version */
     (__typeof__ (__free_hook))
 #endif
     voodoo_free_hook;
@@ -3613,34 +3617,7 @@ Codename of this version of Emacs (a string).
 #ifndef XEMACS_CODENAME
 #define XEMACS_CODENAME "Noname"
 #endif
-#ifdef MULE
-  {
-    char dest[129];
-    char src[64] = XEMACS_CODENAME;
-    unsigned char* sp = (unsigned char*)src;
-    int i = 0, chr;
-
-    while ( (chr = *sp++) && (i < 128) )
-      {
-       if (chr <= 0x7F)
-         dest[i++] = chr;
-       else
-         {
-#ifdef UTF2000
-           dest[i++] = (chr >> 6) | 0xC0;
-           dest[i++] = (chr & 0x3F) | 0x80;
-#else
-           dest[i++] = LEADING_BYTE_LATIN_ISO8859_1;
-           dest[i++] = chr;
-#endif
-         }
-      }
-    dest[i] = 0;
-    Vxemacs_codename = build_string (dest);
-  }
-#else  
   Vxemacs_codename = build_string (XEMACS_CODENAME);
-#endif
 
   /* Lisp variables which contain command line flags.
 
@@ -3849,23 +3826,6 @@ configure's idea of what `mule-lisp-directory' will be.
   Vconfigure_mule_lisp_directory = Qnil;
 #endif
 
-  DEFVAR_LISP ("utf-2000-lisp-directory", &Vutf_2000_lisp_directory /*
-*Directory of UTF-2000 Lisp files that come with XEmacs.
-*/ );
-  Vutf_2000_lisp_directory = Qnil;
-
-  DEFVAR_LISP ("configure-utf-2000-lisp-directory",
-              &Vconfigure_utf_2000_lisp_directory /*
-For internal use by the build procedure only.
-configure's idea of what `utf-2000-lisp-directory' will be.
-*/ );
-#ifdef PATH_UTF2000LOADSEARCH
-  Vconfigure_utf_2000_lisp_directory = Ffile_name_as_directory
-    (build_string ((char *) PATH_UTF2000LOADSEARCH));
-#else
-  Vconfigure_utf_2000_lisp_directory = Qnil;
-#endif
-
   DEFVAR_LISP ("module-directory", &Vmodule_directory /*
 *Directory of core dynamic modules that come with XEmacs.
 */ );