*** empty log message ***

diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 490c59aa922df2f484f140c5814bbe63814d3642..de0dc31edfff1d26eca41b79c89163b4b59c7045 100644 (file)
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -1217,6 +1217,10 @@ resources to load all the colors it needs.
 
 A solution is to exit the offending X programs before starting Emacs.
 
+"undefined color" messages can also occur if the RgbPath entry in the
+X configuration file is incorrect, or the rgb.txt file is not where
+X expects to find it.
+
 *** Improving performance with slow X connections.
 
 There are several ways to improve this performance, any subset of which can

diff --git a/src/ChangeLog b/src/ChangeLog
index f11202c3064ff72b4ae831aca2e6e04bc36d24ad..cfac9120ce615783548444dc20e4fb83b20ef1bf 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-11  Eli Zaretskii  <eliz@gnu.org>
+
+       * vm-limit.c [HAVE_GETRLIMIT]: Don't define unconditionally.
+       Don't include sys/resource.h unless defined.
+
 2006-03-11  Richard Stallman  <rms@gnu.org>
 
        * keymap.c (describe_map): Shorten string to indicate shadowed binding.