From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 11 Mar 2006 15:46:24 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~3681
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9257b6273afb9f97b64fa331623ffc0afdeb5382;p=emacs.git

*** empty log message ***
---

diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 490c59aa922..de0dc31edff 100644
--- 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 f11202c3064..cfac9120ce6 100644
--- 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.