Merge frome mainline.

8 files changed, 97 insertions, 42 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 14e06fc1e28..ac909cc7885 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,38 @@
+2010-02-27  Chong Yidong  <cyd@stupidchicken.com>
+
+        * font.c (font_parse_fcname): Recognize "Book", "Condensed",
+        "Medium", and "Semi-Condensed" keywords in GTK names (Bug#5646).
+
+2010-02-26  Kenichi Handa  <handa@m17n.org>
+
+        * ftfont.c (ftfont_get_open_type_spec): Fix parsing of otf_spec.
+
+        * xdisp.c (reseat_to_string): Fix previous change.
+
+2010-02-26  David Reitter  <david.reitter@gmail.com>
+
+        * nsfont.m (nsfont_draw): ns_antialias_text should be a
+        Lisp_Object (Bug#4736).
+
+2010-02-25  Kenichi Handa  <handa@m17n.org>
+
+        * xdisp.c (reseat_to_string): Fix previous change (bug#5609).
+
+2010-02-24  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (XTflash): Move declarations before statements.
+
+        * gtkutil.c (xg_get_gdk_display): Remove (unused).
+        (xg_get_pixbuf_from_pix_and_mask, xg_create_frame_widgets)
+        (xg_toggle_notify_cb, xg_set_toolkit_scroll_bar_thumb)
+        (xg_create_tool_bar): Remove unused variables.
+        (x_wm_set_size_hint): Move declarations before statements.
+        (xg_create_frame_widgets): Remove variable grav,
+
+2010-02-21  Chong Yidong  <cyd@stupidchicken.com>
+
+        * m/arm.h: Define the LIB_GCC flag to be -lgcc_s (Bug#5518).
+
 2010-02-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * term.c (fatal): Add a final \n if needed (bug#5596).
diff --git a/src/font.c b/src/font.c
index 5f1d59afe22..765712198fe 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1576,6 +1576,18 @@ font_parse_fcname (name, font)
               prop = font_intern_prop ("light", 5, 1);
               FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop);
             }
+          else if (PROP_MATCH ("Book", 4))
+            {
+              prop_found = 1;
+              prop = font_intern_prop ("book", 4, 1);
+              FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop);
+            }
+          else if (PROP_MATCH ("Medium", 6))
+            {
+              prop_found = 1;
+              prop = font_intern_prop ("medium", 6, 1);
+              FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop);
+            }
           else if (PROP_MATCH ("Semi-Bold", 9))
             {
               prop_found = 1;
@@ -1600,6 +1612,18 @@ font_parse_fcname (name, font)
               prop = font_intern_prop ("oblique", 7, 1);
               FONT_SET_STYLE (font, FONT_SLANT_INDEX, prop);
             }
+          else if (PROP_MATCH ("Semi-Condensed", 14))
+            {
+              prop_found = 1;
+              prop = font_intern_prop ("semi-condensed", 14, 1);
+              FONT_SET_STYLE (font, FONT_WIDTH_INDEX, prop);
+            }
+          else if (PROP_MATCH ("Condensed", 9))
+            {
+              prop_found = 1;
+              prop = font_intern_prop ("condensed", 9, 1);
+              FONT_SET_STYLE (font, FONT_WIDTH_INDEX, prop);
+            }
           else {
             if (prop_found)
               return -1; /* Unknown property in GTK-style font name.  */
diff --git a/src/ftfont.c b/src/ftfont.c
index 492d03bb8bf..f4fe5b8e5c0 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -663,19 +663,19 @@ ftfont_get_open_type_spec (Lisp_Object otf_spec)
   else
     spec->script_tag = 0x44464C54;      /* "DFLT" */
   otf_spec = XCDR (otf_spec);
-  val = XCAR (otf_spec);
-  if (! NILP (val))
-    OTF_SYM_TAG (val, spec->langsys_tag);
-  else
-    spec->langsys_tag = 0;
+  spec->langsys_tag = 0;
+  if (! NILP (otf_spec))
+    {
+      val = XCAR (otf_spec);
+      if (! NILP (val))
+        OTF_SYM_TAG (val, spec->langsys_tag);
+      otf_spec = XCDR (otf_spec);
+    }
   spec->nfeatures[0] = spec->nfeatures[1] = 0;
-  for (i = 0; i < 2; i++)
+  for (i = 0; i < 2 && ! NILP (otf_spec); i++, otf_spec = XCDR (otf_spec))
     {
       Lisp_Object len;
 
-      otf_spec = XCDR (otf_spec);
-      if (NILP (otf_spec))
-        break;
       val = XCAR (otf_spec);
       if (NILP (val))
         continue;
diff --git a/src/gtkutil.c b/src/gtkutil.c
index a42c07aef5d..2764382e8a1 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -58,15 +58,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 static GdkDisplay *gdpy_def;
 
-/* Return the GdkDisplay that corresponds to the X display DPY.  */
-
-static GdkDisplay *
-xg_get_gdk_display (dpy)
-     Display *dpy;
-{
-  return gdk_x11_lookup_xdisplay (dpy);
-}
-
 /* When the GTK widget W is to be created on a display for F that
    is not the default display, set the display for W.
    W can be a GtkMenu or a GtkWindow widget.  */
@@ -252,10 +243,8 @@ xg_get_pixbuf_from_pix_and_mask (gpix, gmask, cmap)
      GdkPixmap *gmask;
      GdkColormap *cmap;
 {
-  int x, y, width, height, rowstride, mask_rowstride;
+  int width, height;
   GdkPixbuf *icon_buf, *tmp_buf;
-  guchar *pixels;
-  guchar *mask_pixels;
 
   gdk_drawable_get_size (gpix, &width, &height);
   tmp_buf = gdk_pixbuf_get_from_drawable (NULL, gpix, cmap,
@@ -776,7 +765,6 @@ xg_create_frame_widgets (f)
   GtkWidget *wfixed;
   GdkColor bg;
   GtkRcStyle *style;
-  int i;
   char *title = 0;
 
   BLOCK_INPUT;
@@ -844,8 +832,8 @@ xg_create_frame_widgets (f)
      and specify it.
      GTK will itself handle calculating the real position this way.  */
   xg_set_geometry (f);
-  int grav = gtk_window_get_gravity (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)));
-  f->win_gravity = grav;
+  f->win_gravity
+    = gtk_window_get_gravity (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)));
 
   gtk_widget_add_events (wfixed,
                          GDK_POINTER_MOTION_MASK
@@ -901,12 +889,6 @@ x_wm_set_size_hint (f, flags, user_position)
      long flags;
      int user_position;
 {
-  /* Don't set size hints during initialization; that apparently leads
-     to a race condition.  See the thread at
-     http://lists.gnu.org/archive/html/emacs-devel/2008-10/msg00033.html  */
-  if (NILP (Vafter_init_time) || !FRAME_GTK_OUTER_WIDGET (f))
-    return;
-
   /* Must use GTK routines here, otherwise GTK resets the size hints
      to its own defaults.  */
   GdkGeometry size_hints;
@@ -915,6 +897,12 @@ x_wm_set_size_hint (f, flags, user_position)
   int min_rows = 0, min_cols = 0;
   int win_gravity = f->win_gravity;
 
+  /* Don't set size hints during initialization; that apparently leads
+     to a race condition.  See the thread at
+     http://lists.gnu.org/archive/html/emacs-devel/2008-10/msg00033.html  */
+  if (NILP (Vafter_init_time) || !FRAME_GTK_OUTER_WIDGET (f))
+    return;
+
   if (flags)
     {
       memset (&size_hints, 0, sizeof (size_hints));
@@ -1391,7 +1379,6 @@ xg_toggle_notify_cb (gobject, arg1, user_data)
 
   if (strcmp (arg1->name, "show-hidden") == 0)
     {
-      GtkFileChooser *dialog = GTK_FILE_CHOOSER (gobject);
       GtkWidget *wtoggle = GTK_WIDGET (user_data);
       gboolean visible, toggle_on;
 
@@ -3347,8 +3334,6 @@ xg_set_toolkit_scroll_bar_thumb (bar, portion, position, whole)
 
       if (changed || (int) gtk_range_get_value (GTK_RANGE (wscroll)) != value)
       {
-        GtkWidget *wfixed = f->output_data.x->edit_widget;
-
         BLOCK_INPUT;
 
         /* gtk_range_set_value invokes the callback.  Set
@@ -3801,7 +3786,6 @@ xg_create_tool_bar (f)
      FRAME_PTR f;
 {
   struct x_output *x = f->output_data.x;
-  GtkRequisition req;
 
   x->toolbar_widget = gtk_toolbar_new ();
   x->toolbar_detached = 0;
diff --git a/src/m/arm.h b/src/m/arm.h
index ad3e701d276..b04c5ecc1d9 100644
--- a/src/m/arm.h
+++ b/src/m/arm.h
@@ -36,5 +36,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define NO_REMAP
 
+/* armin76@gentoo.org reported that the lgcc_s flag is necessary to
+   build on ARM EABI under GNU/Linux (Bug#5518).  */
+#ifdef GNU_LINUX
+#define LIB_GCC -lgcc_s
+#endif
+
 /* arch-tag: 07856f0c-f0c8-4bd8-99af-0b7fa1e5ee42
    (do not change this comment) */
diff --git a/src/nsfont.m b/src/nsfont.m
index 97d74a82f2b..59d5ee73db1 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -50,7 +50,7 @@ extern Lisp_Object Qnormal, Qbold, Qitalic, Qcondensed, Qexpanded;
 static Lisp_Object Vns_reg_to_script;
 static Lisp_Object Qapple, Qroman, Qmedium;
 extern Lisp_Object Qappend;
-extern int ns_antialias_text;
+extern Lisp_Object ns_antialias_text;
 extern float ns_antialias_threshold;
 extern int ns_tmp_flags;
 extern struct nsfont_info *ns_tmp_font;
@@ -1231,7 +1231,7 @@ nsfont_draw (struct glyph_string *s, int from, int to, int x, int y,
 
     CGContextSetFont (gcontext, font->cgfont);
     CGContextSetFontSize (gcontext, font->size);
-    if (ns_antialias_text == Qnil || font->size <= ns_antialias_threshold)
+    if (NILP (ns_antialias_text) || font->size <= ns_antialias_threshold)
       CGContextSetShouldAntialias (gcontext, 0);
     else
       CGContextSetShouldAntialias (gcontext, 1);
diff --git a/src/xdisp.c b/src/xdisp.c
index f27d99fa5f9..056a009a7d9 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5745,8 +5745,13 @@ reseat_to_string (it, s, string, charpos, precision, field_width, multibyte)
 
   it->stop_charpos = charpos;
   if (s == NULL && it->multibyte_p)
-    composition_compute_stop_pos (&it->cmp_it, charpos, -1, it->end_charpos,
-                                  it->string);
+    {
+      EMACS_INT endpos = SCHARS (it->string);
+      if (endpos > it->end_charpos)
+        endpos = it->end_charpos;
+      composition_compute_stop_pos (&it->cmp_it, charpos, -1, endpos,
+                                    it->string);
+    }
   CHECK_IT (it);
 }
 
diff --git a/src/xterm.c b/src/xterm.c
index b4a04195430..fd09d6d4815 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3019,13 +3019,14 @@ XTflash (f)
     /* Use Gdk routines to draw.  This way, we won't draw over scroll bars
        when the scroll bars and the edit widget share the same X window.  */
     GdkGCValues vals;
+    GdkGC *gc;
     vals.foreground.pixel = (FRAME_FOREGROUND_PIXEL (f)
                              ^ FRAME_BACKGROUND_PIXEL (f));
     vals.function = GDK_XOR;
-    GdkGC *gc = gdk_gc_new_with_values (FRAME_GTK_WIDGET (f)->window,
-                                        &vals,
-                                        GDK_GC_FUNCTION
-                                        | GDK_GC_FOREGROUND);
+    gc = gdk_gc_new_with_values (FRAME_GTK_WIDGET (f)->window,
+                                 &vals,
+                                 GDK_GC_FUNCTION
+                                 | GDK_GC_FOREGROUND);
 #define XFillRectangle(d, win, gc, x, y, w, h) \
     gdk_draw_rectangle (FRAME_GTK_WIDGET (f)->window, \
                         gc, TRUE, x, y, w, h)