aboutsummaryrefslogtreecommitdiffstats
path: root/src/term.c
diff options
context:
space:
mode:
authorKenichi Handa2012-01-21 20:36:42 +0900
committerKenichi Handa2012-01-21 20:36:42 +0900
commit678fb7066698ebfe3aecba722294025ed26da01b (patch)
tree951ac3055141d950974051d13c10e5d7c6a98e31 /src/term.c
parent71784361eb381ec2b12bd8283724a7addec49079 (diff)
parent959ad23fb9020a121c4520946835e9f0aeb9bcb2 (diff)
downloademacs-678fb7066698ebfe3aecba722294025ed26da01b.tar.gz
emacs-678fb7066698ebfe3aecba722294025ed26da01b.zip
merge trunk
Diffstat (limited to 'src/term.c')
-rw-r--r--src/term.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/term.c b/src/term.c
index ae505f020f2..53458c559dd 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1,5 +1,5 @@
1/* Terminal control module for terminals described by TERMCAP 1/* Terminal control module for terminals described by TERMCAP
2 Copyright (C) 1985-1987, 1993-1995, 1998, 2000-2011 2 Copyright (C) 1985-1987, 1993-1995, 1998, 2000-2012
3 Free Software Foundation, Inc. 3 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
@@ -1809,7 +1809,7 @@ append_glyphless_glyph (struct it *it, int face_id, const char *str)
1809 glyphless_display_method in dispextern.h for the details. 1809 glyphless_display_method in dispextern.h for the details.
1810 1810
1811 FOR_NO_FONT is nonzero if and only if this is for a character that 1811 FOR_NO_FONT is nonzero if and only if this is for a character that
1812 is not supproted by the coding system of the terminal. ACRONYM, if 1812 is not supported by the coding system of the terminal. ACRONYM, if
1813 non-nil, is an acronym string for the character. 1813 non-nil, is an acronym string for the character.
1814 1814
1815 The glyphs actually produced are of type CHAR_GLYPH. */ 1815 The glyphs actually produced are of type CHAR_GLYPH. */