aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2002-01-13 00:36:34 +0000
committerAndreas Schwab2002-01-13 00:36:34 +0000
commit437dfb9f777e4cacf79985b9fa7858767da4b4c1 (patch)
tree9942ab75ba5c6981bedd6892d4068aea8b5cb3a3 /src
parentba3dafc8c940c5c26edf0dd5e22c0c59a3b89dad (diff)
downloademacs-437dfb9f777e4cacf79985b9fa7858767da4b4c1.tar.gz
emacs-437dfb9f777e4cacf79985b9fa7858767da4b4c1.zip
(x_load_font): Never set fonts_changed_p to zero.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xterm.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c88bdc116b4..69000f91041 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12002-01-13 Andreas Schwab <schwab@suse.de>
2
3 * xterm.c (x_load_font): Never set fonts_changed_p to zero.
4
12002-01-12 Andreas Schwab <schwab@suse.de> 52002-01-12 Andreas Schwab <schwab@suse.de>
2 6
3 * .gdbinit (xbuffer): Remove address operator since data is now a 7 * .gdbinit (xbuffer): Remove address operator since data is now a
diff --git a/src/xterm.c b/src/xterm.c
index 1ab3bf3292e..503b67bcdf3 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -14173,10 +14173,10 @@ x_load_font (f, fontname, size)
14173 14173
14174 /* Set global flag fonts_changed_p to non-zero if the font loaded 14174 /* Set global flag fonts_changed_p to non-zero if the font loaded
14175 has a character with a smaller width than any other character 14175 has a character with a smaller width than any other character
14176 before, or if the font loaded has a smalle>r height than any 14176 before, or if the font loaded has a smaller height than any
14177 other font loaded before. If this happens, it will make a 14177 other font loaded before. If this happens, it will make a
14178 glyph matrix reallocation necessary. */ 14178 glyph matrix reallocation necessary. */
14179 fonts_changed_p = x_compute_min_glyph_bounds (f); 14179 fonts_changed_p |= x_compute_min_glyph_bounds (f);
14180 UNBLOCK_INPUT; 14180 UNBLOCK_INPUT;
14181 return fontp; 14181 return fontp;
14182 } 14182 }