From: Martin Rudalics <rudalics@gmx.at>
Date: Sun, 8 Dec 2013 09:56:02 +0000 (+0100)
Subject: In x_set_font mark frame as garbaged (Bug#16028).
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~511
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=acfe46025afa0f3ba1398b675de6da6ad0e3460e;p=emacs.git

In x_set_font mark frame as garbaged (Bug#16028).

* frame.c (x_set_font): Mark frame as garbaged (Bug#16028).
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 1eba6bb71c4..02be1e9bd64 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-08  Martin Rudalics  <rudalics@gmx.at>
+
+	* frame.c (x_set_font): Mark frame as garbaged (Bug#16028).
+
 2013-12-08  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Use libcrypto's checksum implementations if available, for speed.
diff --git a/src/frame.c b/src/frame.c
index 03bdf696c47..e13c3768e12 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3314,9 +3314,13 @@ x_set_font (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
 #endif
   /* Recalculate toolbar height.  */
   f->n_tool_bar_rows = 0;
+
   /* Ensure we redraw it.  */
   clear_current_matrices (f);
 
+  /* Attempt to hunt down bug#16028.  */
+  SET_FRAME_GARBAGED (f);
+
   recompute_basic_faces (f);
 
   do_pending_window_change (0);