aboutsummaryrefslogtreecommitdiffstats
path: root/src/character.c
diff options
context:
space:
mode:
authorK. Handa2015-01-07 22:51:41 +0900
committerK. Handa2015-01-07 22:51:41 +0900
commit88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf (patch)
tree18da116400703b67738bdbbd38cc4abf4c1e929f /src/character.c
parent3f79d3131629f73da16ec121d2a0056f11b70e65 (diff)
parent95295df44cc2b6e0e2442aeff96b0fe2ceac405c (diff)
downloademacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.tar.gz
emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.zip
Merge branch master of git.sv.gnu.org:/srv/git/emacs.
Diffstat (limited to 'src/character.c')
-rw-r--r--src/character.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/character.c b/src/character.c
index a8e48dfd774..4a5c7ec3156 100644
--- a/src/character.c
+++ b/src/character.c
@@ -1,6 +1,6 @@
1/* Basic character support. 1/* Basic character support.
2 2
3Copyright (C) 2001-2014 Free Software Foundation, Inc. 3Copyright (C) 2001-2015 Free Software Foundation, Inc.
4Copyright (C) 1995, 1997, 1998, 2001 Electrotechnical Laboratory, JAPAN. 4Copyright (C) 1995, 1997, 1998, 2001 Electrotechnical Laboratory, JAPAN.
5 Licensed to the Free Software Foundation. 5 Licensed to the Free Software Foundation.
6Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 6Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
@@ -48,16 +48,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
48 48
49#endif /* emacs */ 49#endif /* emacs */
50 50
51Lisp_Object Qcharacterp;
52
53static Lisp_Object Qauto_fill_chars;
54
55/* Char-table of information about which character to unify to which 51/* Char-table of information about which character to unify to which
56 Unicode character. Mainly used by the macro MAYBE_UNIFY_CHAR. */ 52 Unicode character. Mainly used by the macro MAYBE_UNIFY_CHAR. */
57Lisp_Object Vchar_unify_table; 53Lisp_Object Vchar_unify_table;
58 54
59static Lisp_Object Qchar_script_table;
60
61 55
62 56
63/* If character code C has modifier masks, reflect them to the 57/* If character code C has modifier masks, reflect them to the