Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-300

3 files changed, 62 insertions, 10 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
new file mode 100644
index 00000000000..56693064c98
--- /dev/null
+++ b/admin/CPP-DEFINES
@@ -0,0 +1,46 @@
+Here are some of the cpp macros used, together with some short explanation
+of their use.  Feel free to add more macros and more categories.
+
+** Distinguishing OSes **
+
+MAC_OS          Compiling for some version of Mac OS?
+MAC_OS8         Compiling for Mac OS version 8.  Requires MAC_OS?
+MAC_OSX         Compiling for Mac OS X?  Is that also valid for Darwin?
+MAC_OS_X        ??  Apparently only used once in mac.c.
+CYGWIN          Compiling the Cygwin port.
+__CYGWIN__      Ditto
+MSDOS           Compiling the MS-DOS port.
+__MSDOS__       Ditto.
+__DJGPP__       Major version number of the DJGPP library for the DOS port.
+__DJGPP_MINOR__ Minor version number of the DJGPP library.
+__GO32__        Compiling the DOS port with DJGPP v1.x (obsolete).
+DOS_NT          Compiling for either the MS-DOS or native MS-Windows port.
+WINDOWSNT       Compiling the native MS-Windows (W32) port.
+__MINGW32__     Compiling the W32 port with the MinGW port of GCC.
+_MSC_VER        Compiling the W32 port with the Microsoft C compiler.
+
+** Distinguishing GUIs **
+
+HAVE_NTGUI      Use the native W32 GUI for windows, frames, menus&scrollbars.
+HAVE_CARBON     Compile support for the Carbon GUI.  Requires MAC_OS?
+HAVE_X11        Compile support for the X11 GUI.
+HAVE_X_WINDOWS  Compile support for X Window system
+X11             ??  Makefile.in suggests it's equivalent to HAVE_X11
+USE_LUCID       Use the Lucid toolkit for menus&scrollbars.  Requires HAVE_X11.
+USE_MOTIF       Use the Motif toolkit for menus&scrollbars.  Requires HAVE_X11.
+USE_GTK         Use the Gtk   toolkit for menus&scrollbars.  Requires HAVE_X11.
+
+** Frame types **
+
+FRAME_TERMCAP_P A tty (character terminal) frame.
+FRAME_X_P       A frame on X Window system.
+FRAME_MSDOS_P   An MS-DOS frame (used only by the DOS port).
+FRAME_MAC_P     A Mac frame.
+FRAME_W32_P     A frame using native MS-Windows GUI.
+FRAME_WINDOW_P  A GUI frame (like X, w32, etc.)
+
+** Compile-time options **
+REL_ALLOC       Compile in the relocatable memory allocator ralloc.c.
+SYSTEM_MALLOC   Use the system library's malloc.
+
+# arch-tag: bc80061a-1168-4911-9766-46aaf2640250
diff --git a/admin/ChangeLog b/admin/ChangeLog
index c3252d3ff70..516cecfbb6d 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,13 @@
+2007-12-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * CPP-DEFINES: New file.
+
+2007-12-08  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * FOR-RELEASE: Remove "window-system in face definition" [of
+        gnus-treat-emphasize].  Remove "Gnus archive groups".  Add comment
+        on gnus-dired.el.
+
 2007-12-05  Glenn Morris  <rgm@gnu.org>
 
         * admin.el (set-version): Handle configure.in.  Adapt for doc/
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 3ab61ba577c..f96da325b75 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -91,16 +91,8 @@ http://lists.gnu.org/archive/html/emacs-devel/2007-05/msg01339.html
 
 ** rms: gnus-dired.el is a mistake.  Those features should not
 be part of Gnus.  They should be moved to some other part of Emacs.
-
-** sdl.web@gmail.com, 28 Oct: window-system in face definition
-
-** Gnus archive groups are not shown at all if they are not at the default level. 
-Fixed in Gnus CVS, but the patch has not been synched to Emacs yet:
-http://thread.gmane.org/gmane.emacs.gnus.general/65622/focus=65757
-
-** Extra question asked when doing a reply in Gnus
-Fixed in Gnus CVS, but the patch has not been synched to Emacs yet:
-http://thread.gmane.org/gmane.emacs.gnus.general/65627/65768
+rsteib: Gnus dependencies in `gnus-dired.el' (and `mailcap.el') have been
+minimized.  I don't know what is left to do here.
 
 ** sdl.web@gmail.com, 30 Oct: ps-lpr-switches has no effect
 
@@ -115,6 +107,10 @@ http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg02052.html
 ** Fix or document the shortcoming of easymenu and :suffix.
 http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01857.html
 
+** Fix problem with mode-name in SGML mode.
+If mode-name stays non-string, add NEWS entry and doc fix.
+http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg02048.html
+
 * DOCUMENTATION
 
 ** Check the Emacs Tutorial.