diff options
| author | K. Handa | 2015-01-07 22:51:41 +0900 |
|---|---|---|
| committer | K. Handa | 2015-01-07 22:51:41 +0900 |
| commit | 88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf (patch) | |
| tree | 18da116400703b67738bdbbd38cc4abf4c1e929f /src/fontset.c | |
| parent | 3f79d3131629f73da16ec121d2a0056f11b70e65 (diff) | |
| parent | 95295df44cc2b6e0e2442aeff96b0fe2ceac405c (diff) | |
| download | emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.tar.gz emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.zip | |
Merge branch master of git.sv.gnu.org:/srv/git/emacs.
Diffstat (limited to 'src/fontset.c')
| -rw-r--r-- | src/fontset.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/fontset.c b/src/fontset.c index ac50be1c925..b257da117b6 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Fontset handler. | 1 | /* Fontset handler. |
| 2 | 2 | ||
| 3 | Copyright (C) 2001-2014 Free Software Foundation, Inc. | 3 | Copyright (C) 2001-2015 Free Software Foundation, Inc. |
| 4 | Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | 4 | Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
| 5 | 2005, 2006, 2007, 2008, 2009, 2010, 2011 | 5 | 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| 6 | National Institute of Advanced Industrial Science and Technology (AIST) | 6 | National Institute of Advanced Industrial Science and Technology (AIST) |
| @@ -152,11 +152,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 152 | 152 | ||
| 153 | /********** VARIABLES and FUNCTION PROTOTYPES **********/ | 153 | /********** VARIABLES and FUNCTION PROTOTYPES **********/ |
| 154 | 154 | ||
| 155 | static Lisp_Object Qfontset; | ||
| 156 | static Lisp_Object Qfontset_info; | ||
| 157 | static Lisp_Object Qprepend, Qappend; | ||
| 158 | Lisp_Object Qlatin; | ||
| 159 | |||
| 160 | /* Vector containing all fontsets. */ | 155 | /* Vector containing all fontsets. */ |
| 161 | static Lisp_Object Vfontset_table; | 156 | static Lisp_Object Vfontset_table; |
| 162 | 157 | ||