X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/25a48bd06bd5979d201cddde99e2dec1eb54c184..d032d5e7dfabfae60f3304da02c97cd1e189b9a2:/src/xfaces.c

diff --git a/src/xfaces.c b/src/xfaces.c
index e4f9f317b8..4cc47c8505 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -2899,7 +2899,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
 	    {
@@ -2909,7 +2909,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);
 	    }
 	}
 
@@ -5970,7 +5970,7 @@ compute_char_face (struct frame *f, int ch, Lisp_Object prop)
 {
   int face_id;
 
-  if (NILP (current_buffer->enable_multibyte_characters))
+  if (NILP (BVAR (current_buffer, enable_multibyte_characters)))
     ch = 0;
 
   if (NILP (prop))