Merge from mainline.

[gnu-emacs] / src / s / msdos.h

diff --git a/src/s/msdos.h b/src/s/msdos.h
index 7699f80d192adb38be6a92a09b981e103872e172..88771b9f15fc82a3d85da44d1fd082d08f3833f3 100644 (file)
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -1,7 +1,7 @@
 /* System description file for MS-DOS
 
    Copyright (C) 1993, 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006,
-                 2007, 2008 Free Software Foundation, Inc.
+                 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -87,6 +87,10 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
    in how to declare valloc.  */
 #define GMALLOC_INHIBIT_VALLOC
 
+/* This overrides the default value on editfns.c, since DJGPP
+   does not have pw->pw_gecos.  */
+#define USER_FULL_NAME (getenv ("NAME"))
+
 /* setjmp and longjmp can safely replace _setjmp and _longjmp,
    but they will run slower.  */
 
@@ -189,12 +193,22 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 
 /* Define one of these for easier conditionals.  */
 #ifdef HAVE_X_WINDOWS
-/* We need a little extra space, see ../../lisp/loadup.el */
-#define SYSTEM_PURESIZE_EXTRA 15000
+/* We need a little extra space, see ../../lisp/loadup.el and the
+   commentary below, in the non-X branch.  The 140KB number was
+   measured on GNU/Linux and on MS-WIndows.  */
+#define SYSTEM_PURESIZE_EXTRA (-170000+140000)
 #define LIBX11_SYSTEM -lxext -lsys
 #else
-/* We need a little extra space, see ../../lisp/loadup.el */
-#define SYSTEM_PURESIZE_EXTRA 50000
+/* We need a little extra space, see ../../lisp/loadup.el.
+   As of 20091024, DOS-specific files use up 62KB of pure space.  But
+   overall, we end up wasting 130KB of pure space, because
+   BASE_PURESIZE starts at 1.47MB, while we need only 1.3MB (including
+   non-DOS specific files and load history; the latter is about 55K,
+   but depends on the depth of the top-level Emacs directory in the
+   directory tree).  Given the unknown policy of different DPMI
+   hosts regarding loading of untouched pages, I'm not going to risk
+   enlarging Emacs footprint by another 100+ KBytes.  */
+#define SYSTEM_PURESIZE_EXTRA (-170000+65000)
 #endif
 
 /* Tell the garbage collector that setjmp is known to save all