[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100447: Doc fixes related to face heights. (Bug#2659)

[Glenn Morris]

------------------------------------------------------------
revno: 100447
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Wed 2011-02-02 22:55:48 -0800
message:
  Doc fixes related to face heights. (Bug#2659)
  
  * lisp/faces.el (set-face-attribute): Doc fix.
  
  * src/xfaces.c (Finternal_set_lisp_face_attribute):
  Try to clarify some error messages.
modified:
  lisp/ChangeLog
  lisp/faces.el
  src/ChangeLog
  src/xfaces.c

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-02-02 16:20:26 +0000
+++ b/lisp/ChangeLog    2011-02-03 06:55:48 +0000
@@ -1,3 +1,7 @@
+2011-02-03  Glenn Morris  <address@hidden>
+
+       * faces.el (set-face-attribute): Doc fix.  (Bug#2659)
+
 2011-02-02  Stefan Monnier  <address@hidden>
 
        * pcomplete.el (pcomplete-here*): Backport fix for mistaken change

=== modified file 'lisp/faces.el'
--- a/lisp/faces.el     2011-01-02 23:50:46 +0000
+++ b/lisp/faces.el     2011-02-03 06:55:48 +0000
@@ -616,10 +616,14 @@
 
 `: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'
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-02 15:53:20 +0000
+++ b/src/ChangeLog     2011-02-03 06:55:48 +0000
@@ -1,3 +1,8 @@
+2011-02-03  Glenn Morris  <address@hidden>
+
+       * xfaces.c (Finternal_set_lisp_face_attribute):
+       Try to clarify some error messages.  (Bug#2659)
+
 2011-02-02  Stefan Monnier  <address@hidden>
 
        * editfns.c (save_restriction_restore): Don't forget to invalidate the

=== modified file 'src/xfaces.c'
--- a/src/xfaces.c      2011-01-02 23:50:46 +0000
+++ b/src/xfaces.c      2011-02-03 06:55:48 +0000
@@ -3060,7 +3060,7 @@
            {
              /* 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 @@
                                                     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);
            }
        }