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/category.c | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
| download | emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.tar.gz emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.zip | |
merge master, fix conflicts
Diffstat (limited to 'src/category.c')
| -rw-r--r-- | src/category.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/category.c b/src/category.c index 09c78240a59..b20493e5949 100644 --- a/src/category.c +++ b/src/category.c | |||
| @@ -53,8 +53,6 @@ bset_category_table (struct buffer *b, Lisp_Object val) | |||
| 53 | 53 | ||
| 54 | For the moment, we are not using this feature. */ | 54 | For the moment, we are not using this feature. */ |
| 55 | static int category_table_version; | 55 | static int category_table_version; |
| 56 | |||
| 57 | static Lisp_Object Qcategory_table, Qcategoryp, Qcategorysetp, Qcategory_table_p; | ||
| 58 | 56 | ||
| 59 | /* Category set staff. */ | 57 | /* Category set staff. */ |
| 60 | 58 | ||