aboutsummaryrefslogtreecommitdiffstats
path: root/src/fontset.h
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/fontset.h
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/fontset.h')
-rw-r--r--src/fontset.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/fontset.h b/src/fontset.h
index 884244e6e61..610394431e1 100644
--- a/src/fontset.h
+++ b/src/fontset.h
@@ -1,5 +1,5 @@
1/* Header for fontset handler. 1/* Header for fontset handler.
2 Copyright (C) 1998, 2001-2014 Free Software Foundation, Inc. 2 Copyright (C) 1998, 2001-2015 Free Software Foundation, Inc.
3 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 3 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4 2005, 2006, 2007, 2008, 2009, 2010, 2011 4 2005, 2006, 2007, 2008, 2009, 2010, 2011
5 National Institute of Advanced Industrial Science and Technology (AIST) 5 National Institute of Advanced Industrial Science and Technology (AIST)
@@ -36,7 +36,6 @@ extern int fontset_from_font (Lisp_Object);
36extern int fs_query_fontset (Lisp_Object, int); 36extern int fs_query_fontset (Lisp_Object, int);
37extern Lisp_Object list_fontsets (struct frame *, Lisp_Object, int); 37extern Lisp_Object list_fontsets (struct frame *, Lisp_Object, int);
38 38
39extern Lisp_Object Qlatin;
40extern Lisp_Object fontset_name (int); 39extern Lisp_Object fontset_name (int);
41extern Lisp_Object fontset_ascii (int); 40extern Lisp_Object fontset_ascii (int);
42 41