[PATCH] trivial fixes for CANNOT_UNDUMP bugs in emacs-21.2

[PATCH] trivial fixes for CANNOT_UNDUMP bugs in emacs-21.2

[Joe Buehler]

[-- Attachment #1: Type: text/plain, Size: 517 bytes --]

There are a couple bugs in emacs 21.2 when it is compiled with
#define CANNOT_DUMP

1. The default screen bg and fg colors are not initialized,
causing them to be black on black, which is obviously unreadable.

2. The DOC file is not installed when "make install" is run --
or rather, it is installed, but then it is promptly removed,
because an assumption is being made that the proper file is
DOC-21.2, which is not true under #define CANNOT_DUMP -- it
should be just plain DOC.

Patches are attached.

Joe Buehler

[-- Attachment #2: emacs.patch --]
[-- Type: text/plain, Size: 991 bytes --]

diff -u -r -N -x '*~*' Makefile.in Makefile.in
--- Makefile.in	2001-10-31 09:45:46.000000000 -0500
+++ Makefile.in	2002-08-13 17:15:20.000000000 -0400
@@ -407,7 +407,8 @@
 	   echo "Copying etc/DOC-* to ${docdir} ..." ; \
 	   (cd ./etc; tar -chf - DOC*) \
 	     |(cd ${docdir}; umask 0; tar -xvf - && cat > /dev/null) || exit 1; \
-	   (cd $(docdir); chmod a+r DOC*; rm DOC); \
+	   (cd ${docdir}; chmod a+r DOC*; if test "`echo DOC-*`" != "DOC-*"; \
+		then rm DOC; fi); \
 	else true; fi
 	-unset CDPATH; \
 	if [ -r ./lisp ] \
diff -u -r -N -x '*~*' src/frame.c src/frame.c
--- src/frame.c	2001-10-25 17:03:52.000000000 -0400
+++ src/frame.c	2002-08-20 14:55:26.000000000 -0400
@@ -486,6 +486,10 @@
   make_mac_terminal_frame (f);
 #else
   f->output_data.x = &tty_display;
+#ifdef CANNOT_DUMP
+  FRAME_FOREGROUND_PIXEL(f) = FACE_TTY_DEFAULT_FG_COLOR;
+  FRAME_BACKGROUND_PIXEL(f) = FACE_TTY_DEFAULT_BG_COLOR;
+#endif
 #endif /* macintosh */
 #endif /* WINDOWSNT */
 #endif /* MSDOS */