46 files changed, 35 insertions, 46 deletions
diff --git a/src/blowfish.h b/src/blowfish.h
index ecf6278b6d..288187f433 100644
--- a/src/blowfish.h
+++ b/src/blowfish.h
@@ -10,5 +10,4 @@ void bf_crypt_save(void);
 void bf_crypt_restore(void);
 int blowfish_self_test(void);
 
-// vim: set ft=c:
 #endif  // NEOVIM_BLOWFISH_H
diff --git a/src/buffer.h b/src/buffer.h
index 740d001b5e..d2d6ae1aa5 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -79,5 +79,5 @@ void sign_mark_adjust(linenr_T line1, linenr_T line2, long amount,
 void set_buflisted(int on);
 int buf_contents_changed(buf_T *buf);
 void wipe_buffer(buf_T *buf, int aucmd);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_BUFFER_H */
diff --git a/src/charset.h b/src/charset.h
index ddcd8ac41c..190611727d 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -64,5 +64,4 @@ void backslash_halve(char_u *p);
 char_u *backslash_halve_save(char_u *p);
 void ebcdic2ascii(char_u *buffer, int len);
 
-// vim: set ft=c:
 #endif  // NEOVIM_CHARSET_H
diff --git a/src/diff.h b/src/diff.h
index 61da3c6190..223fe8add2 100644
--- a/src/diff.h
+++ b/src/diff.h
@@ -30,5 +30,4 @@ linenr_T diff_get_corresponding_line(buf_T *buf1, linenr_T lnum1,
                                      linenr_T lnum3);
 linenr_T diff_lnum_win(linenr_T lnum, win_T *wp);
 
-// vim: set ft=c:
 #endif  // NEOVIM_DIFF_H
diff --git a/src/digraph.h b/src/digraph.h
index e19d2e4106..796066bb68 100644
--- a/src/digraph.h
+++ b/src/digraph.h
@@ -9,5 +9,4 @@ void listdigraphs(void);
 char_u *keymap_init(void);
 void ex_loadkeymap(exarg_T *eap);
 
-// vim: set ft=c:
 #endif  // NEOVIM_DIGRAPH_H
diff --git a/src/edit.h b/src/edit.h
index e52bfa61d6..193938dfa3 100644
--- a/src/edit.h
+++ b/src/edit.h
@@ -56,5 +56,5 @@ int hkmap(int c);
 void ins_scroll(void);
 void ins_horscroll(void);
 int ins_copychar(linenr_T lnum);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_EDIT_H */
diff --git a/src/eval.h b/src/eval.h
index 5738a01684..a15762ea5e 100644
--- a/src/eval.h
+++ b/src/eval.h
@@ -148,5 +148,5 @@ int modify_fname(char_u *src, int *usedlen, char_u **fnamep,
                  int *fnamelen);
 char_u *do_string_sub(char_u *str, char_u *pat, char_u *sub,
                       char_u *flags);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_EVAL_H */
diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index 8892541ec9..43e8e0cd27 100644
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -72,5 +72,5 @@ void free_signs(void);
 char_u *get_sign_name(expand_T *xp, int idx);
 void set_context_in_sign_cmd(expand_T *xp, char_u *arg);
 void ex_drop(exarg_T *eap);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_EX_CMDS_H */
diff --git a/src/ex_cmds2.h b/src/ex_cmds2.h
index eb5ac0547e..732c618eb7 100644
--- a/src/ex_cmds2.h
+++ b/src/ex_cmds2.h
@@ -93,5 +93,5 @@ void ex_language(exarg_T *eap);
 void free_locales(void);
 char_u *get_lang_arg(expand_T *xp, int idx);
 char_u *get_locales(expand_T *xp, int idx);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_EX_CMDS2_H */
diff --git a/src/ex_docmd.h b/src/ex_docmd.h
index 52c5ba8803..a866023dbc 100644
--- a/src/ex_docmd.h
+++ b/src/ex_docmd.h
@@ -66,5 +66,5 @@ int put_eol(FILE *fd);
 int put_line(FILE *fd, char *s);
 void dialog_msg(char_u *buff, char *format, char_u *fname);
 char_u *get_behave_arg(expand_T *xp, int idx);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_EX_DOCMD_H */
diff --git a/src/ex_eval.h b/src/ex_eval.h
index 8690247489..4fcf4760ff 100644
--- a/src/ex_eval.h
+++ b/src/ex_eval.h
@@ -155,5 +155,5 @@ void rewind_conditionals(struct condstack *cstack, int idx,
                          int *cond_level);
 void ex_endfunction(exarg_T *eap);
 int has_loop_cmd(char_u *p);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_EX_EVAL_H */
diff --git a/src/ex_getln.h b/src/ex_getln.h
index f347201a82..2eece4e940 100644
--- a/src/ex_getln.h
+++ b/src/ex_getln.h
@@ -65,5 +65,5 @@ void write_viminfo_history(FILE *fp, int merge);
 void cmd_pchar(int c, int offset);
 int cmd_gchar(int offset);
 char_u *script_get(exarg_T *eap, char_u *cmd);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_EX_GETLN_H */
diff --git a/src/fileio.h b/src/fileio.h
index 0e8cc22e61..301d951bdf 100644
--- a/src/fileio.h
+++ b/src/fileio.h
@@ -93,5 +93,5 @@ char_u *file_pat_to_reg_pat(char_u *pat, char_u *pat_end,
                             int no_bslash);
 long read_eintr(int fd, void *buf, size_t bufsize);
 long write_eintr(int fd, void *buf, size_t bufsize);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_FILEIO_H */
diff --git a/src/fold.h b/src/fold.h
index baa781645a..5023511e0d 100644
--- a/src/fold.h
+++ b/src/fold.h
@@ -61,5 +61,5 @@ char_u *get_foldtext(win_T *wp, linenr_T lnum, linenr_T lnume,
                      char_u *buf);
 void foldtext_cleanup(char_u *str);
 int put_folds(FILE *fd, win_T *wp);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_FOLD_H */
diff --git a/src/getchar.h b/src/getchar.h
index d4dcdaf4fb..e53697f29e 100644
--- a/src/getchar.h
+++ b/src/getchar.h
@@ -74,5 +74,5 @@ char_u *check_map(char_u *keys, int mode, int exact, int ign_mod,
                   int *local_ptr);
 void init_mappings(void);
 void add_map(char_u *map, int mode);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_GETCHAR_H */
diff --git a/src/hardcopy.h b/src/hardcopy.h
index b1ebe8d0ea..0ae206517b 100644
--- a/src/hardcopy.h
+++ b/src/hardcopy.h
@@ -89,5 +89,5 @@ int mch_print_text_out(char_u *p, int len);
 void mch_print_set_font(int iBold, int iItalic, int iUnderline);
 void mch_print_set_bg(long_u bgcol);
 void mch_print_set_fg(long_u fgcol);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_HARDCOPY_H */
diff --git a/src/hashtab.h b/src/hashtab.h
index bdcb5a0a2f..4285358bea 100644
--- a/src/hashtab.h
+++ b/src/hashtab.h
@@ -52,5 +52,5 @@ void hash_remove(hashtab_T *ht, hashitem_T *hi);
 void hash_lock(hashtab_T *ht);
 void hash_unlock(hashtab_T *ht);
 hash_T hash_hash(char_u *key);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_HASHTAB_H */
diff --git a/src/if_cscope.h b/src/if_cscope.h
index f76d131c93..74d4df83ea 100644
--- a/src/if_cscope.h
+++ b/src/if_cscope.h
@@ -12,5 +12,5 @@ void cs_free_tags(void);
 void cs_print_tags(void);
 int cs_connection(int num, char_u *dbpath, char_u *ppath);
 void cs_end(void);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_IF_CSCOPE_H */
diff --git a/src/main.h b/src/main.h
index 286540b3cb..d1b305c39d 100644
--- a/src/main.h
+++ b/src/main.h
@@ -14,5 +14,5 @@ void time_msg(char *mesg, void *tv_start);
 void server_to_input_buf(char_u *str);
 char_u *eval_client_expr_to_string(char_u *expr);
 char_u *serverConvert(char_u *client_enc, char_u *data, char_u **tofree);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_MAIN_H */
diff --git a/src/mark.h b/src/mark.h
index 28620b6620..203e10d118 100644
--- a/src/mark.h
+++ b/src/mark.h
@@ -38,5 +38,5 @@ int removable(char_u *name);
 int write_viminfo_marks(FILE *fp_out);
 void copy_viminfo_marks(vir_T *virp, FILE *fp_out, int count, int eof,
                         int flags);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_MARK_H */
diff --git a/src/mbyte.h b/src/mbyte.h
index d3871eb1b2..4f05a33e3c 100644
--- a/src/mbyte.h
+++ b/src/mbyte.h
@@ -99,5 +99,5 @@ int convert_input_safe(char_u *ptr, int len, int maxlen, char_u **restp,
 char_u *string_convert(vimconv_T *vcp, char_u *ptr, int *lenp);
 char_u *string_convert_ext(vimconv_T *vcp, char_u *ptr, int *lenp,
                            int *unconvlenp);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_MBYTE_H */
diff --git a/src/memfile.h b/src/memfile.h
index 264c08558f..283d7795ca 100644
--- a/src/memfile.h
+++ b/src/memfile.h
@@ -21,5 +21,5 @@ blocknr_T mf_trans_del(memfile_T *mfp, blocknr_T old_nr);
 void mf_set_ffname(memfile_T *mfp);
 void mf_fullname(memfile_T *mfp);
 int mf_need_trans(memfile_T *mfp);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_MEMFILE_H */
diff --git a/src/memline.h b/src/memline.h
index e7636fdc7d..6f68409ba4 100644
--- a/src/memline.h
+++ b/src/memline.h
@@ -43,5 +43,5 @@ void ml_decrypt_data(memfile_T *mfp, char_u *data, off_t offset,
                      unsigned size);
 long ml_find_line_or_offset(buf_T *buf, linenr_T lnum, long *offp);
 void goto_byte(long cnt);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_MEMLINE_H */
diff --git a/src/menu.h b/src/menu.h
index 6d1732703f..fea6296305 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -69,5 +69,5 @@ void gui_mch_toggle_tearoffs(int enable);
 void ex_emenu(exarg_T *eap);
 vimmenu_T *gui_find_menu(char_u *path_name);
 void ex_menutranslate(exarg_T *eap);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_MENU_H */
diff --git a/src/message.h b/src/message.h
index d7c40c5259..2db9bfc85c 100644
--- a/src/message.h
+++ b/src/message.h
@@ -81,5 +81,5 @@ int vim_dialog_yesnoallcancel(int type, char_u *title, char_u *message,
 char_u *do_browse(int flags, char_u *title, char_u *dflt, char_u *ext,
                   char_u *initdir, char_u *filter,
                   buf_T *buf);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_MESSAGE_H */
diff --git a/src/misc1.h b/src/misc1.h
index b2543f6f77..a68b9d3b6f 100644
--- a/src/misc1.h
+++ b/src/misc1.h
@@ -70,5 +70,5 @@ void fast_breakcheck(void);
 char_u *get_cmd_output(char_u *cmd, char_u *infile, int flags);
 void FreeWild(int count, char_u **files);
 int goto_im(void);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_MISC1_H */
diff --git a/src/misc2.h b/src/misc2.h
index ddac0dbd7e..e73bbfaddf 100644
--- a/src/misc2.h
+++ b/src/misc2.h
@@ -70,5 +70,5 @@ char_u *read_string(FILE *fd, int cnt);
 int put_bytes(FILE *fd, long_u nr, int len);
 void put_time(FILE *fd, time_t the_time);
 int has_non_ascii(char_u *s);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_MISC2_H */
diff --git a/src/move.h b/src/move.h
index 19907d6d3f..f568e4a337 100644
--- a/src/move.h
+++ b/src/move.h
@@ -40,5 +40,5 @@ void cursor_correct(void);
 int onepage(int dir, long count);
 void halfpage(int flag, linenr_T Prenum);
 void do_check_cursorbind(void);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_MOVE_H */
diff --git a/src/normal.h b/src/normal.h
index 2d4b55138b..e6ccdd1120 100644
--- a/src/normal.h
+++ b/src/normal.h
@@ -83,5 +83,5 @@ void do_nv_ident(int c1, int c2);
 int get_visual_text(cmdarg_T *cap, char_u **pp, int *lenp);
 void start_selection(void);
 void may_start_select(int c);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_NORMAL_H */
diff --git a/src/ops.h b/src/ops.h
index 34affac32d..0b5d8590ae 100644
--- a/src/ops.h
+++ b/src/ops.h
@@ -69,5 +69,5 @@ void write_reg_contents_ex(int name, char_u *str, int maxlen,
                            long block_len);
 void clear_oparg(oparg_T *oap);
 void cursor_pos_info(void);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_OPS_H */
diff --git a/src/option.h b/src/option.h
index f054bfe10e..ab1368cc77 100644
--- a/src/option.h
+++ b/src/option.h
@@ -73,5 +73,5 @@ long get_sw_value(buf_T *buf);
 long get_sts_value(void);
 void find_mps_values(int *initc, int *findc, int *backwards,
                              int switchit);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_OPTION_H */
diff --git a/src/os_unix.h b/src/os_unix.h
index c6b656dc63..9122ff81aa 100644
--- a/src/os_unix.h
+++ b/src/os_unix.h
@@ -42,5 +42,5 @@ int mch_has_wildcard(char_u *p);
 int mch_libcall(char_u *libname, char_u *funcname, char_u *argstring,
                 int argint, char_u **string_result,
                 int *number_result);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_OS_UNIX_H */
diff --git a/src/popupmnu.h b/src/popupmnu.h
index 2010492845..bed355245a 100644
--- a/src/popupmnu.h
+++ b/src/popupmnu.h
@@ -16,5 +16,4 @@ void pum_clear(void);
 int pum_visible(void);
 int pum_get_height(void);
 
-// vim: set ft=c:
 #endif  // NEOVIM_POPUPMNU_H
diff --git a/src/quickfix.h b/src/quickfix.h
index 71a3a684a0..ae53137ce8 100644
--- a/src/quickfix.h
+++ b/src/quickfix.h
@@ -32,5 +32,5 @@ int set_errorlist(win_T *wp, list_T *list, int action, char_u *title);
 void ex_cbuffer(exarg_T *eap);
 void ex_cexpr(exarg_T *eap);
 void ex_helpgrep(exarg_T *eap);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_QUICKFIX_H */
diff --git a/src/regexp.h b/src/regexp.h
index f0995946e2..118f066b1c 100644
--- a/src/regexp.h
+++ b/src/regexp.h
@@ -23,5 +23,5 @@ int vim_regexec_nl(regmatch_T *rmp, char_u *line, colnr_T col);
 long vim_regexec_multi(regmmatch_T *rmp, win_T *win, buf_T *buf,
                                linenr_T lnum, colnr_T col,
                                proftime_T *tm);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_REGEXP_H */
diff --git a/src/screen.h b/src/screen.h
index 21218aee92..bb4175c46d 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -65,5 +65,5 @@ void showruler(int always);
 int number_width(win_T *wp);
 int screen_screencol(void);
 int screen_screenrow(void);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_SCREEN_H */
diff --git a/src/search.h b/src/search.h
index 87e97555ee..d0137dcd78 100644
--- a/src/search.h
+++ b/src/search.h
@@ -48,5 +48,5 @@ void find_pattern_in_path(char_u *ptr, int dir, int len, int whole,
                           linenr_T end_lnum);
 int read_viminfo_search_pattern(vir_T *virp, int force);
 void write_viminfo_search_pattern(FILE *fp);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_SEARCH_H */
diff --git a/src/sha256.h b/src/sha256.h
index 7f84ec16b3..b8d6bf5c76 100644
--- a/src/sha256.h
+++ b/src/sha256.h
@@ -15,5 +15,4 @@ char_u *sha256_key(char_u *buf, char_u *salt, int salt_len);
 int sha256_self_test(void);
 void sha2_seed(char_u *header, int header_len, char_u *salt, int salt_len);
 
-// vim: set ft=c:
 #endif  // NEOVIM_SHA256_H
diff --git a/src/spell.h b/src/spell.h
index 6541e8fe25..3322f66098 100644
--- a/src/spell.h
+++ b/src/spell.h
@@ -29,5 +29,5 @@ char_u *spell_to_word_end(char_u *start, win_T *win);
 int spell_word_start(int startcol);
 void spell_expand_check_cap(colnr_T col);
 int expand_spelling(linenr_T lnum, char_u *pat, char_u ***matchp);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_SPELL_H */
diff --git a/src/syntax.h b/src/syntax.h
index 52dfc775db..a2ae4ce4e1 100644
--- a/src/syntax.h
+++ b/src/syntax.h
@@ -62,5 +62,5 @@ int highlight_changed(void);
 void set_context_in_highlight_cmd(expand_T *xp, char_u *arg);
 char_u *get_highlight_name(expand_T *xp, int idx);
 void free_highlight_fonts(void);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_SYNTAX_H */
diff --git a/src/tag.h b/src/tag.h
index 72da6e0e19..a5e1b4d491 100644
--- a/src/tag.h
+++ b/src/tag.h
@@ -24,5 +24,5 @@ void tagname_free(tagname_T *tnp);
 int expand_tags(int tagnames, char_u *pat, int *num_file,
                 char_u ***file);
 int get_tags(list_T *list, char_u *pat);
-/* vim: set ft=c : */
+
 #endif /* NEOVIM_TAG_H */
diff --git a/src/term.h b/src/term.h
index 2211efc805..6459ac8ae2 100644
--- a/src/term.h
+++ b/src/term.h
@@ -64,5 +64,4 @@ void show_termcodes(void);
 int show_one_termcode(char_u *name, char_u *code, int printit);
 char_u *translate_mapping(char_u *str, int expmap);
 void update_tcap(int attr);
-/* vim: set ft=c : */
 #endif /* NEOVIM_TERM_H */
diff --git a/src/ui.h b/src/ui.h
index 533c9924fc..cd23cff049 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -65,5 +65,4 @@ int get_fpos_of_mouse(pos_T *mpos);
 int vcol2col(win_T *wp, linenr_T lnum, int vcol);
 void ui_focus_change(int in_focus);
 void im_save_status(long *psave);
-/* vim: set ft=c : */
 #endif /* NEOVIM_UI_H */
diff --git a/src/undo.h b/src/undo.h
index 396b05ef94..7f12ba577c 100644
--- a/src/undo.h
+++ b/src/undo.h
@@ -33,5 +33,4 @@ void u_blockfree(buf_T *buf);
 int bufIsChanged(buf_T *buf);
 int curbufIsChanged(void);
 void u_eval_tree(u_header_T *first_uhp, list_T *list);
-/* vim: set ft=c : */
 #endif /* NEOVIM_UNDO_H */
diff --git a/src/version.h b/src/version.h
index a400cdbfc1..4941a40096 100644
--- a/src/version.h
+++ b/src/version.h
@@ -10,5 +10,4 @@ void maybe_intro_message(void);
 void intro_message(int colon);
 void ex_intro(exarg_T *eap);
 
-// vim: set ft=c:
 #endif  // NEOVIM_VERSION_H
diff --git a/src/window.h b/src/window.h
index ef2fa5b6d1..405934a6ea 100644
--- a/src/window.h
+++ b/src/window.h
@@ -86,5 +86,4 @@ void clear_matches(win_T *wp);
 matchitem_T *get_match(win_T *wp, int id);
 int get_win_number(win_T *wp, win_T *first_win);
 int get_tab_number(tabpage_T *tp);
-/* vim: set ft=c : */
 #endif /* NEOVIM_WINDOW_H */