diff options
| author | Joakim Verona | 2015-01-11 18:40:21 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-11 18:40:21 +0100 |
| commit | cc7cb20d6abc0f862e5513b24831bba0eaecaa5f (patch) | |
| tree | afc2fc05401504aa0c28699dc3bc155c5b0d7f58 /src/fontset.c | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
| download | emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.tar.gz emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.zip | |
merge master, fix conflicts
Diffstat (limited to 'src/fontset.c')
| -rw-r--r-- | src/fontset.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/fontset.c b/src/fontset.c index 974b144c259..b257da117b6 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -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 | ||