aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2007-01-31 12:16:25 +0000
committerJuanma Barranquero2007-01-31 12:16:25 +0000
commit95facc1758046e52a3d11d483dff2f1b8b5bf11a (patch)
treee98de58136a9b69ad566ec7be730260d7e4e4cb7
parent57a644088367051b17da4ac1e7ef0b20fc72b947 (diff)
downloademacs-95facc1758046e52a3d11d483dff2f1b8b5bf11a.tar.gz
emacs-95facc1758046e52a3d11d483dff2f1b8b5bf11a.zip
(color-values): Doc fix.
(face-differs-from-default-p): Don't check :foreground twice.
-rw-r--r--lisp/faces.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/faces.el b/lisp/faces.el
index 7b521d385b1..53e3b004533 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -248,8 +248,8 @@ If FRAME is t, report on the defaults for face FACE (for new frames).
248If FRAME is omitted or nil, use the selected frame." 248If FRAME is omitted or nil, use the selected frame."
249 (let ((attrs 249 (let ((attrs
250 '(:family :width :height :weight :slant :foreground 250 '(:family :width :height :weight :slant :foreground
251 :foreground :background :underline :overline 251 :background :underline :overline :strike-through
252 :strike-through :box :inverse-video)) 252 :box :inverse-video))
253 (differs nil)) 253 (differs nil))
254 (while (and attrs (not differs)) 254 (while (and attrs (not differs))
255 (let* ((attr (pop attrs)) 255 (let* ((attr (pop attrs))
@@ -1541,7 +1541,7 @@ If COLOR is the symbol `unspecified' or one of the strings
1541(defun color-values (color &optional frame) 1541(defun color-values (color &optional frame)
1542 "Return a description of the color named COLOR on frame FRAME. 1542 "Return a description of the color named COLOR on frame FRAME.
1543The value is a list of integer RGB values--\(RED GREEN BLUE\). 1543The value is a list of integer RGB values--\(RED GREEN BLUE\).
1544These values appear to range from 0 65535; white is \(65535 65535 65535\). 1544These values range from 0 to 65535; white is \(65535 65535 65535\).
1545If FRAME is omitted or nil, use the selected frame. 1545If FRAME is omitted or nil, use the selected frame.
1546If FRAME cannot display COLOR, the value is nil. 1546If FRAME cannot display COLOR, the value is nil.
1547If COLOR is the symbol `unspecified' or one of the strings 1547If COLOR is the symbol `unspecified' or one of the strings