diff lisp/ChangeLog @ 109224:91be20d0588d

Merge from mainline.
author Katsumi Yamaoka <katsumi@flagship2>
date Tue, 15 Jun 2010 11:40:23 +0000
parents 0c1f025545a1
children 812d563cc192
line wrap: on
line diff
--- a/lisp/ChangeLog	Mon Jun 14 11:56:46 2010 +0000
+++ b/lisp/ChangeLog	Tue Jun 15 11:40:23 2010 +0000
@@ -1,3 +1,26 @@
+2010-06-15  Juanma Barranquero  <lekktu@gmail.com>
+
+	* facemenu.el (list-colors-sort): Doc fix.
+
+2010-06-15  Bob Rogers  <rogers-emacs@rgrjr.dyndns.org>  (tiny change)
+
+	* progmodes/sql.el (sql-connect-mysql): Fix typo.
+
+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.