diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2012-01-09 09:36:10 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-01-09 09:36:10 -0800 |
commit | 35cf62d95cdcd5323dcea4a5385942c342ff1d9c (patch) | |
tree | 90358cbb033a126c4d48793a80fd804b7baaca24 /src/term.c | |
parent | 59815c02506eb39b61e672528ed03885749ba529 (diff) | |
parent | 7655cb66d86564e792b825f1a0e1a4de7d6e6db5 (diff) |
Merge from trunk.
Diffstat (limited to 'src/term.c')
-rw-r--r-- | src/term.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/term.c b/src/term.c index 036f5797e4..09888bc6dd 100644 --- a/src/term.c +++ b/src/term.c @@ -1,5 +1,5 @@ /* Terminal control module for terminals described by TERMCAP - Copyright (C) 1985-1987, 1993-1995, 1998, 2000-2011 + Copyright (C) 1985-1987, 1993-1995, 1998, 2000-2012 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -1809,7 +1809,7 @@ append_glyphless_glyph (struct it *it, int face_id, const char *str) glyphless_display_method in dispextern.h for the details. FOR_NO_FONT is nonzero if and only if this is for a character that - is not supproted by the coding system of the terminal. ACRONYM, if + is not supported by the coding system of the terminal. ACRONYM, if non-nil, is an acronym string for the character. The glyphs actually produced are of type CHAR_GLYPH. */ |