X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/4b72b4f91122704b805e2696b2e9342226359de0..9bf31d1d3f35880c652f76509d1e27d33e454121:/src/composite.h diff --git a/src/composite.h b/src/composite.h index 1080eb0960..80e1740883 100644 --- a/src/composite.h +++ b/src/composite.h @@ -1,5 +1,5 @@ /* Header for composite sequence handler. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2016 Free Software Foundation, Inc. Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 @@ -11,8 +11,8 @@ This file is part of GNU Emacs. GNU Emacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +the Free Software Foundation, either version 3 of the License, or (at +your option) any later version. GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -190,7 +190,6 @@ extern ptrdiff_t n_compositions; #define CHECK_BORDER (CHECK_HEAD | CHECK_TAIL) #define CHECK_ALL (CHECK_BORDER | CHECK_INSIDE) -extern Lisp_Object Qcomposition; extern Lisp_Object composition_hash_table; extern ptrdiff_t get_composition_id (ptrdiff_t, ptrdiff_t, ptrdiff_t, Lisp_Object, Lisp_Object);