Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 18:37:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Doc fixes related to face heights. (Bug#2659)

Browse source 
* lisp/faces.el (set-face-attribute): Doc fix.

* src/xfaces.c (Finternal_set_lisp_face_attribute):
Try to clarify some error messages.
This commit is contained in:
Glenn Morris 2011-02-02 22:55:48 -08:00
parent 1cb274e286
commit 95838641ae
4 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2011-02-03 Glenn Morris <rgm@gnu.org>
* faces.el (set-face-attribute): Doc fix. (Bug#2659)
2011-02-02 Stefan Monnier <monnier@iro.umontreal.ca>
* pcomplete.el (pcomplete-here*): Backport fix for mistaken change

12
lisp/faces.el
View file

@ -616,10 +616,14 @@ It must be one of the symbols `ultra-condensed', `extra-condensed',
`:height'
VALUE must be either an integer specifying the height of the font to use
in 1/10 pt, a floating point number specifying the amount by which to
scale any underlying face, or a function, which is called with the old
height (from the underlying face), and should return the new height.
VALUE specifies the height of the font, in either absolute or relative
terms. An absolute height is an integer, and specifies font height in
units of 1/10 pt. A relative height is either a floating point number,
which specifies a scaling factor for the underlying face height;
or a function that takes a single argument (the underlying face height)
and returns the new height. Note that for the `default' face,
you can only specify an absolute height (since there is nothing
for it to be relative to).
`:weight'

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2011-02-03 Glenn Morris <rgm@gnu.org>
* xfaces.c (Finternal_set_lisp_face_attribute):
Try to clarify some error messages. (Bug#2659)
2011-02-02 Stefan Monnier <monnier@iro.umontreal.ca>
* editfns.c (save_restriction_restore): Don't forget to invalidate the

4
src/xfaces.c
View file

@ -3060,7 +3060,7 @@ FRAME 0 means change the face on all frames, and change the default
{
/* The default face must have an absolute size. */
if (!INTEGERP (value) || XINT (value) <= 0)
signal_error ("Invalid default face height", value);
signal_error ("Default face height not absolute and positive", value);
}
else
{
@ -3070,7 +3070,7 @@ FRAME 0 means change the face on all frames, and change the default
make_number (10),
Qnil);
if (!INTEGERP (test) || XINT (test) <= 0)
signal_error ("Invalid face height", value);
signal_error ("Face height does not produce a positive integer", value);
}
}