Merge from emacs-23; up to 2010-05-26T14:19:15Z!monnier@iro.umontreal.ca.

6 files changed, 36 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 02644342d46..d757a89836d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,23 @@
+2011-02-05  Glenn Morris  <rgm@gnu.org>
+
+        * xfaces.c (Finternal_set_lisp_face_attribute):
+        Try to clarify some error messages.  (Bug#2659)
+
+2011-02-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * editfns.c (save_restriction_restore): Don't forget to invalidate the
+        current_column cache (bug#7946).
+
+2011-02-05  Kenichi Handa  <handa@m17n.org>
+
+        * ftfont.c (ftfont_open): Use FC_DUAL only when it is defined.
+
+        * xftfont.c (xftfont_open): Likewise.
+
+2011-02-05  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * window.c (Fselect_window): Add missing return value.
+
 2011-02-05  Paul Eggert  <eggert@cs.ucla.edu>
 
         xstrcasecmp: conform to C89 pointer rules
diff --git a/src/editfns.c b/src/editfns.c
index 1733580ee32..f70b3312a69 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3256,6 +3256,9 @@ save_restriction_restore (Lisp_Object data)
         }
     }
 
+  /* Changing the buffer bounds invalidates any recorded current column.  */
+  invalidate_current_column ();
+
   if (cur)
     set_buffer_internal (cur);
 
diff --git a/src/ftfont.c b/src/ftfont.c
index 576bc42a6ff..db6b29421dc 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -1240,7 +1240,11 @@ ftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
     spacing = XINT (AREF (entity, FONT_SPACING_INDEX));
   else
     spacing = FC_PROPORTIONAL;
-  if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL)
+  if (spacing != FC_PROPORTIONAL
+#ifdef FC_DUAL
+      && spacing != FC_DUAL
+#endif  /* FC_DUAL */
+      )
     font->min_width = font->average_width = font->space_width
       = (scalable ? ft_face->max_advance_width * size / upEM
          : ft_face->size->metrics.max_advance >> 6);
diff --git a/src/window.c b/src/window.c
index 41eed893d6a..abf01758c3f 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3589,7 +3589,7 @@ Note that the main editor command loop selects the buffer of the
 selected window before each command.  */)
      (register Lisp_Object window, Lisp_Object norecord)
 {
-  select_window (window, norecord, 0);
+  return select_window (window, norecord, 0);
 }
 
 static Lisp_Object
diff --git a/src/xfaces.c b/src/xfaces.c
index e4f9f317b8e..82ad0b9aeb6 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);
             }
         }
 
diff --git a/src/xftfont.c b/src/xftfont.c
index e7eabc47c39..084ca735171 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -411,7 +411,11 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
         ascii_printable[i] = ' ' + i;
     }
   BLOCK_INPUT;
-  if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL)
+  if (spacing != FC_PROPORTIONAL
+#ifdef FC_DUAL
+      && spacing != FC_DUAL
+#endif  /* FC_DUAL */
+      )
     {
       font->min_width = font->average_width = font->space_width
         = xftfont->max_advance_width;