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.h | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
| download | emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.tar.gz emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.zip | |
merge master, fix conflicts
Diffstat (limited to 'src/fontset.h')
| -rw-r--r-- | src/fontset.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/fontset.h b/src/fontset.h index e743555ef76..610394431e1 100644 --- a/src/fontset.h +++ b/src/fontset.h | |||
| @@ -36,7 +36,6 @@ extern int fontset_from_font (Lisp_Object); | |||
| 36 | extern int fs_query_fontset (Lisp_Object, int); | 36 | extern int fs_query_fontset (Lisp_Object, int); |
| 37 | extern Lisp_Object list_fontsets (struct frame *, Lisp_Object, int); | 37 | extern Lisp_Object list_fontsets (struct frame *, Lisp_Object, int); |
| 38 | 38 | ||
| 39 | extern Lisp_Object Qlatin; | ||
| 40 | extern Lisp_Object fontset_name (int); | 39 | extern Lisp_Object fontset_name (int); |
| 41 | extern Lisp_Object fontset_ascii (int); | 40 | extern Lisp_Object fontset_ascii (int); |
| 42 | 41 | ||