Mercurial > emacs

changeset 6879:471aebc1b151

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(frame_update_line_height): Don't call x_set_window_size. Return 1 if line_height changed. (Fset_face_attribute_internal): Call x_set_window_size here if nec.
author Richard M. Stallman <rms@gnu.org>
date Thu, 14 Apr 1994 12:07:21 +0000
parents 175e4da3d3f4
children b6ef9edeb65d
files src/xfaces.c
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/xfaces.c	Thu Apr 14 12:05:41 1994 +0000
+++ b/src/xfaces.c	Thu Apr 14 12:07:21 1994 +0000
@@ -652,9 +652,9 @@
 }
 
 /* Update the line_height of frame F according to the biggest font in
-   any face, and resize the frame if line_height changes.  */
+   any face.  Return nonzero if if line_height changes.  */
 
-void
+int
 frame_update_line_height (f)
      FRAME_PTR f;
 {
@@ -671,10 +671,10 @@
       }
 
   if (biggest == f->display.x->line_height)
-    return;
+    return 0;
 
   f->display.x->line_height = biggest;
-  x_set_window_size (f, 0, f->width, f->height);
+  return 1;
 }
 
 /* Modify face TO by copying from FROM all properties which have
@@ -986,7 +986,8 @@
       if (face->font != f->display.x->font)
 	unload_font (f, face->font);
       face->font = font;
-      frame_update_line_height (f);
+      if (frame_update_line_height (f))
+	x_set_window_size (f, 0, f->width, f->height);
     }
   else if (EQ (attr_name, intern ("foreground")))
     {