[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110962: Don't crash if internal-c
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110962: Don't crash if internal-char-font is called on non-GUI frames. |
Date: |
Mon, 26 Nov 2012 19:46:35 +0200 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110962
fixes bug: http://debbugs.gnu.org/11964
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Mon 2012-11-26 19:46:35 +0200
message:
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)
modified:
src/ChangeLog
src/fontset.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-11-24 08:24:11 +0000
+++ b/src/ChangeLog 2012-11-26 17:46:35 +0000
@@ -1,3 +1,8 @@
+2012-11-26 Eli Zaretskii <address@hidden>
+
+ * fontset.c (Finternal_char_font): Return nil on non-GUI frames.
+ (Bug#11964)
+
2012-11-24 Paul Eggert <address@hidden>
Revert recent change for Bug#8855.
=== modified file 'src/fontset.c'
--- a/src/fontset.c 2012-10-07 22:31:58 +0000
+++ b/src/fontset.c 2012-11-26 17:46:35 +0000
@@ -1879,6 +1879,8 @@
}
if (! CHAR_VALID_P (c))
return Qnil;
+ if (!FRAME_WINDOW_P (f))
+ return Qnil;
face_id = FACE_FOR_CHAR (f, FACE_FROM_ID (f, face_id), c, pos, Qnil);
face = FACE_FROM_ID (f, face_id);
if (face->font)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r110962: Don't crash if internal-char-font is called on non-GUI frames.,
Eli Zaretskii <=