aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/color.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4d5d5b2f933..696e6e1eedc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-04-05 Bastien Guerry <bzg@altern.org>
2
3 * color.el (color-lighten-name): Fix typo.
4
12012-04-04 Stefan Monnier <monnier@iro.umontreal.ca> 52012-04-04 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * server.el (server--on-display-p): New function. 7 * server.el (server--on-display-p): New function.
diff --git a/lisp/color.el b/lisp/color.el
index 65536752ed8..6ccf9a79494 100644
--- a/lisp/color.el
+++ b/lisp/color.el
@@ -394,7 +394,7 @@ inclusive."
394See `color-lighten-hsl'." 394See `color-lighten-hsl'."
395 (apply 'color-rgb-to-hex 395 (apply 'color-rgb-to-hex
396 (apply 'color-hsl-to-rgb 396 (apply 'color-hsl-to-rgb
397 (apply 'color-lighten--hsl 397 (apply 'color-lighten-hsl
398 (append 398 (append
399 (apply 'color-rgb-to-hsl 399 (apply 'color-rgb-to-hsl
400 (color-name-to-rgb name)) 400 (color-name-to-rgb name))