Merge from trunk.

5 files changed, 22 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 0970bf62b52..25271d6f6b8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2013-12-10  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * xdisp.c (display_tool_bar_line): Don't extend on a previously
+        drawn tool bar items (Bug#16058).
+        * font.c (font_find_for_lface): Ensure SAFE_FREE on return.
+
+2013-12-09  Ken Brown  <kbrown@cornell.edu>
+
+        * frame.c (get_frame_param): Make extern if HAVE_NTGUI.
+
+        * lisp.h (get_frame_param): Adjust conditions for prototype
+        declaration.
+
 2013-12-09  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * gtkutil.c (USE_NEW_GTK_FONT_CHOOSER) [HAVE_FREETYPE]:
diff --git a/src/font.c b/src/font.c
index ad604ebe744..fb56b3d3fb3 100644
--- a/src/font.c
+++ b/src/font.c
@@ -3209,7 +3209,10 @@ font_find_for_lface (struct frame *f, Lisp_Object *attrs, Lisp_Object spec, int
                       val = font_select_entity (f, entities,
                                                 attrs, pixel_size, c);
                       if (! NILP (val))
-                        return val;
+                        {
+                          SAFE_FREE ();
+                          return val;
+                        }
                     }
                 }
             }
diff --git a/src/frame.c b/src/frame.c
index e13c3768e12..43e549235df 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1929,7 +1929,7 @@ If there is no window system support, this function does nothing.  */)
 /* Return the value of frame parameter PROP in frame FRAME.  */
 
 #ifdef HAVE_WINDOW_SYSTEM
-#if !HAVE_NS && !defined (WINDOWSNT)
+#if !HAVE_NS && !HAVE_NTGUI
 static
 #endif
 Lisp_Object
diff --git a/src/lisp.h b/src/lisp.h
index d8cf6b6960e..c4b36557eac 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4046,7 +4046,7 @@ extern void set_frame_param (struct frame *, Lisp_Object, Lisp_Object);
 extern void store_frame_param (struct frame *, Lisp_Object, Lisp_Object);
 extern void store_in_alist (Lisp_Object *, Lisp_Object, Lisp_Object);
 extern Lisp_Object do_switch_frame (Lisp_Object, int, int, Lisp_Object);
-#if HAVE_NS || defined WINDOWSNT
+#if HAVE_NS || HAVE_NTGUI
 extern Lisp_Object get_frame_param (struct frame *, Lisp_Object);
 #endif
 extern void frames_discard_buffer (Lisp_Object);
diff --git a/src/xdisp.c b/src/xdisp.c
index 530eae3cb9e..6daa9131154 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -11937,7 +11937,9 @@ display_tool_bar_line (struct it *it, int height)
   int max_x = it->last_visible_x;
   struct glyph *last;
 
-  prepare_desired_row (row);
+  /* Don't extend on a previously drawn tool bar items (Bug#16058).  */
+  clear_glyph_row (row);
+  row->enabled_p = 1;
   row->y = it->current_y;
 
   /* Note that this isn't made use of if the face hasn't a box,