Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1090

3 files changed, 21 insertions, 1 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index d1353392779..b4ff0a3d199 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -3,6 +3,10 @@
         * NEWS (Gnus): Mention problem with coding system `utf-8-emacs'
         when using different Emacs versions.
 
+2008-02-25  Jan Dj$(Q)Z(Brv  <jan.h.d@swipnet.se>
+
+        * NEWS.22: Mention stock icons for Gtk+.
+
 2008-02-22  Kenichi Handa  <handa@ni.aist.go.jp>
 
         * NEWS: Mention the new language environments Bengali, Punjabi,
diff --git a/etc/DEBUG b/etc/DEBUG
index a266827d9e3..bca9b6ac4f6 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -5,7 +5,7 @@ Copyright (C) 1985, 2000, 2001, 2002, 2003, 2004,
 See the end of the file for license conditions.
 
 
-[People who debug Emacs on Windows using native Windows debuggers
+[People who debug Emacs on Windows using Microsoft debuggers
 should read the Windows-specific section near the end of this
 document.]
 
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index d8600a6b0ba..c97ec91fb51 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -53,6 +53,14 @@ like that, customize the value of the new option `find-name-arg'.
 than the window, the usual keys for moving the cursor cause the image
 to be scrolled horizontally or vertically instead.
 
+** Emacs can use stock icons in the tool bar when compiled with Gtk+.
+However, this feature is disabled by default.  To enable it, put
+
+  (setq icon-map-list '(x-gtk-stock-map))
+
+in your .emacs or some other startup file.  For more information, see
+the documentation for the two variables icon-map-list and x-gtk-stock-map.
+
 ** Scrollbars follow the system theme on Windows XP and later.
 Windows XP introduced themed scrollbars, but applications have to take
 special steps to use them. Emacs now has the appropriate resources linked
@@ -153,6 +161,14 @@ of strings, undoing any quoting added by `combine-and-quote-strings'.
 (For some separator/string combinations, the original strings cannot
 be recovered.)
 
+* Systems that will not be supported in the future
+configure will print a warning and exit for a set of systems that are
+believed to not be in use anymore.  The support has not been removed
+yet, but configure will need to be edited in order to allow
+compilation to proceed on such a system.  If you are using such a
+system, please send a message to emacs-devel@gnu.org in order to take
+off the list of systems.
+
 
 * Installation Changes in Emacs 22.1