Mercurial > emacs

diff src/frame.c @ 90386:2ecafc6d5db7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-58 Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 239-258) - Update from CVS - (Ffield_beginning, find_field): Undo change of 2006-04-23. - Rcirc patch from Ryan Yeske - Merge from gnus--rel--5.10 - Clean up lisp/gnus/ChangeLog a bit * gnus--rel--5.10 (patch 91-98) - Merge from emacs--devo--0 - Update from CVS
author Miles Bader <miles@gnu.org>
date Tue, 02 May 2006 05:51:52 +0000
parents 9e490faa9f6b 29a0b82dbf7a
children a5812696f7bf
line wrap: on
line diff
--- a/src/frame.c	Fri Apr 21 05:39:14 2006 +0000
+++ b/src/frame.c	Tue May 02 05:51:52 2006 +0000
@@ -1,5 +1,5 @@
 /* Generic frame functions.
-   Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003,
+   Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, 2006,
                  2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -3093,9 +3093,15 @@
 	    return;
 	}
       store_frame_param (f, Qfont, result);
+
       if (!NILP (Fequal (result, oldval)))
         return;
 
+      /* Recalculate toolbar height.  */
+      f->n_tool_bar_rows = 0;
+      /* Ensure we redraw it.  */
+      clear_current_matrices (f);
+
       recompute_basic_faces (f);
     }
   else