aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorEli Zaretskii2012-11-26 19:46:35 +0200
committerEli Zaretskii2012-11-26 19:46:35 +0200
commit3fa1e84d43f401876db74e14c7b72f5190fc13b0 (patch)
tree4a73473fdff103dc38173a93e1524029331d3e5e /src/ChangeLog
parent865f7d8fa9411615098165beb9b62ded3e7db9cb (diff)
downloademacs-3fa1e84d43f401876db74e14c7b72f5190fc13b0.tar.gz
emacs-3fa1e84d43f401876db74e14c7b72f5190fc13b0.zip
Don't crash if internal-char-font is called on non-GUI frames.
src/fontset.c (Finternal_char_font): Return nil on non-GUI frames. (Bug#11964)
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 99abda8a884..ce272cc0b53 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-11-26 Eli Zaretskii <eliz@gnu.org>
2
3 * fontset.c (Finternal_char_font): Return nil on non-GUI frames.
4 (Bug#11964)
5
12012-11-24 Paul Eggert <eggert@cs.ucla.edu> 62012-11-24 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Revert recent change for Bug#8855. 8 Revert recent change for Bug#8855.