Add all rgb.txt color names to x-colors.

* facemenu.el (list-colors-print): Don't print extra names if it
will overflow the window width.

* term/common-win.el (x-colors): Add all the color names defined
in rgb.txt (Bug#6332).

1 files changed, 9 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 819a83c8876..ba066a7f651 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * facemenu.el (list-colors-print): Don't print extra names if it
+        will overflow the window width.
+
+        * vc/log-edit.el (log-edit-font-lock-keywords): Revert 2010-06-02
+        change temporarily (Bug#6343).
+
 2010-06-12  Eli Zaretskii  <eliz@gnu.org>
 
         * files.el (make-directory): Doc fix (bug#6396).
@@ -335,7 +343,7 @@
         exists.  Raise an error, if not (due to a corresponding answer
         "no" in interactive questions, for example).
 
-22010-06-02  Dan Nicolaescu  <dann@ics.uci.edu>
+2010-06-02  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * log-edit.el (log-edit-font-lock-keywords): Make group 4 match lax.