diff lisp/ChangeLog @ 109406:f9f0aa88b6f8

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Mon, 14 Jun 2010 22:48:13 +0000
parents 8f3a9d4ebe87
children b2a9d4e48488
line wrap: on
line diff
--- a/lisp/ChangeLog	Sun Jun 13 23:57:38 2010 +0000
+++ b/lisp/ChangeLog	Mon Jun 14 22:48:13 2010 +0000
@@ -1,3 +1,24 @@
+2010-06-14  Juri Linkov  <juri@jurta.org>
+
+	Add sort option `list-colors-sort'.  (Bug#6332)
+	* facemenu.el (color-rgb-to-hsv): New function.
+	(list-colors-sort): New defcustom.
+	(list-colors-sort-key): New function.
+	(list-colors-display): Doc fix.  Sort list according to the option
+	`list-colors-sort'.
+	(list-colors-print): Add HSV values to `help-echo' property of
+	RGB strings.
+
+2010-06-14  Juri Linkov  <juri@jurta.org>
+
+	* compare-w.el: Move to the "vc" subdirectory.
+
+2010-06-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* image-mode.el (image-mode-map): Remap left-char and right-char.
+
+	* nxml/nxml-mode.el (nxml-indent-line): Standardize indent behavior.
+
 2010-06-12  Chong Yidong  <cyd@stupidchicken.com>
 
 	* term/common-win.el (x-colors): Add all the color names defined