*** empty log message ***

2 files changed, 51 insertions, 0 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 22a0ee62218..8f89a8980e9 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -8,6 +8,43 @@ For older news, see the file ONEWS.
 
 * Installation Changes in Emacs 21.1
 
+** There are two new resources for colormap handling under X.
+
+*** The X resource `visualClass, class `VisualClass', specifies the
+visual Emacs should use.  The resource's value should be a string of
+the form `CLASS-DEPTH', where CLASS is the name of the visual class,
+and DEPTH is the requested color depth as a decimal number.  Valid
+visual class names are
+
+  TrueColor
+  PseudoColor
+  DirectColor
+  StaticColor
+  GrayScale
+  StaticGray
+
+Visual class names specified as X resource are case-insensitive, i.e.
+`pseudocolor', `Pseudocolor' and `PseudoColor' all have the same
+meaning.
+
+The program `xdpyinfo' can be used to list the visual classes
+supported on your display, and which depths they have.  If
+`visualClass' is not specified, Emacs uses the display's default
+visual.
+
+Example:
+
+        emacs.visualClass: TrueColor-8
+
+*** The X resource `privateColormap', class `PrivateColormap',
+specifies that Emacs should use a private colormap if it is using the
+default visual, and that visual is of class PseudoColor.  Recognized
+resource values are `true' or `on'.
+
+Example:
+
+        emacs.privateColormap: true
+
 ** `movemail' defaults to supporting POP.  You can turn this off using
 the --without-pop configure option, should that be necessary.
 
diff --git a/src/ChangeLog b/src/ChangeLog
index fdaba32a46f..fd62357353c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2000-03-05  Gerd Moellmann  <gerd@gnu.org>
+
+        * xdisp.c (try_window_id): Recompute unchanged information if
+        it is invalid.
+
+        * xterm.c (x_term_init): Create a colormap if not using the
+        default visual.
+
+        * xterm.h (select_visual): Change prototype.
+
+        * xfns.c (select_visual): Rewritten.  Recognize user-specified
+        visual classes.
+        (visual_classes): New variable.
+
 2000-03-04  Gerd Moellmann  <gerd@gnu.org>
 
         * xfns.c (x_defined_color, x_set_mouse_color, lookup_rgb_color)