2 files changed, 7 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a665fd73047..2b02030fd4f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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
diff --git a/src/xfaces.c b/src/xfaces.c
index ecd726f4540..e9e677d1b19 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -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);
             }
         }