diff options
| author | Eliseo Martínez <eliseomarmol@gmail.com> | 2014-05-13 01:36:11 +0200 |
|---|---|---|
| committer | Eliseo Martínez <eliseomarmol@gmail.com> | 2014-05-15 20:46:02 +0200 |
| commit | 5f795225dcf735096c54057a3b5eb08484c02c8b (patch) | |
| tree | 277c9385401852b0649ee9cfc4bafc759cf65c5a | |
| parent | 71c79b5b7096427f26ac4c4b60244b503efc4b1b (diff) | |
| download | rneovim-5f795225dcf735096c54057a3b5eb08484c02c8b.tar.gz rneovim-5f795225dcf735096c54057a3b5eb08484c02c8b.tar.bz2 rneovim-5f795225dcf735096c54057a3b5eb08484c02c8b.zip | |
Introduce nvim namespace: Fix define guards.
Change define guards from NEOVIM_XXX_H to NVIM_XXX_H:
- Change header files.
- Change clint correct guard name calculation.
109 files changed, 321 insertions, 321 deletions
@@ -1038,7 +1038,7 @@ def GetHeaderGuardCPPVariable(filename): fileinfo = FileInfo(filename) file_path_from_root = fileinfo.RelativePath() - return 'NEOVIM_' + re.sub(r'[-./\s]', '_', file_path_from_root).upper() + return 'NVIM_' + re.sub(r'[-./\s]', '_', file_path_from_root).upper() def CheckForHeaderGuard(filename, lines, error): diff --git a/src/nvim/api/buffer.h b/src/nvim/api/buffer.h index e8b0e596a5..59370b3c18 100644 --- a/src/nvim/api/buffer.h +++ b/src/nvim/api/buffer.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_API_BUFFER_H -#define NEOVIM_API_BUFFER_H +#ifndef NVIM_API_BUFFER_H +#define NVIM_API_BUFFER_H #include <stdint.h> #include <stdbool.h> @@ -141,5 +141,5 @@ void buffer_insert(Buffer buffer, int64_t index, StringArray lines, Error *err); /// @return The (row, col) tuple Position buffer_get_mark(Buffer buffer, String name, Error *err); -#endif // NEOVIM_API_BUFFER_H +#endif // NVIM_API_BUFFER_H diff --git a/src/nvim/api/defs.h b/src/nvim/api/defs.h index 0ac2e790d2..d451667a6c 100644 --- a/src/nvim/api/defs.h +++ b/src/nvim/api/defs.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_API_DEFS_H -#define NEOVIM_API_DEFS_H +#ifndef NVIM_API_DEFS_H +#define NVIM_API_DEFS_H #include <stdint.h> #include <string.h> @@ -70,5 +70,5 @@ struct key_value_pair { }; -#endif // NEOVIM_API_DEFS_H +#endif // NVIM_API_DEFS_H diff --git a/src/nvim/api/helpers.h b/src/nvim/api/helpers.h index a3b264256b..c9c7e9cdc8 100644 --- a/src/nvim/api/helpers.h +++ b/src/nvim/api/helpers.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_API_HELPERS_H -#define NEOVIM_API_HELPERS_H +#ifndef NVIM_API_HELPERS_H +#define NVIM_API_HELPERS_H #include <stdbool.h> @@ -86,5 +86,5 @@ win_T * find_window(Window window, Error *err); /// @return the tabpage pointer tabpage_T * find_tab(Tabpage tabpage, Error *err); -#endif // NEOVIM_API_HELPERS_H +#endif // NVIM_API_HELPERS_H diff --git a/src/nvim/api/tabpage.h b/src/nvim/api/tabpage.h index f4c0d2eac7..54ed70a6f6 100644 --- a/src/nvim/api/tabpage.h +++ b/src/nvim/api/tabpage.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_API_TABPAGE_H -#define NEOVIM_API_TABPAGE_H +#ifndef NVIM_API_TABPAGE_H +#define NVIM_API_TABPAGE_H #include <stdint.h> #include <stdbool.h> @@ -43,5 +43,5 @@ Window tabpage_get_window(Tabpage tabpage, Error *err); /// @return true if the tab page is valid, false otherwise bool tabpage_is_valid(Tabpage tabpage); -#endif // NEOVIM_API_TABPAGE_H +#endif // NVIM_API_TABPAGE_H diff --git a/src/nvim/api/vim.h b/src/nvim/api/vim.h index 27e2639b34..3db9d4d6f6 100644 --- a/src/nvim/api/vim.h +++ b/src/nvim/api/vim.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_API_VIM_H -#define NEOVIM_API_VIM_H +#ifndef NVIM_API_VIM_H +#define NVIM_API_VIM_H #include <stdint.h> #include <stdbool.h> @@ -154,5 +154,5 @@ Tabpage vim_get_current_tabpage(void); /// @param[out] err Details of an error that may have occurred void vim_set_current_tabpage(Tabpage tabpage, Error *err); -#endif // NEOVIM_API_VIM_H +#endif // NVIM_API_VIM_H diff --git a/src/nvim/api/window.h b/src/nvim/api/window.h index 9a85601015..f0e485884a 100644 --- a/src/nvim/api/window.h +++ b/src/nvim/api/window.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_API_WINDOW_H -#define NEOVIM_API_WINDOW_H +#ifndef NVIM_API_WINDOW_H +#define NVIM_API_WINDOW_H #include <stdint.h> #include <stdbool.h> @@ -111,5 +111,5 @@ Tabpage window_get_tabpage(Window window, Error *err); /// @return true if the window is valid, false otherwise bool window_is_valid(Window window); -#endif // NEOVIM_API_WINDOW_H +#endif // NVIM_API_WINDOW_H diff --git a/src/nvim/arabic.h b/src/nvim/arabic.h index 5129b5a56a..829a10e44e 100644 --- a/src/nvim/arabic.h +++ b/src/nvim/arabic.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_ARABIC_H -#define NEOVIM_ARABIC_H +#ifndef NVIM_ARABIC_H +#define NVIM_ARABIC_H /// Whether c belongs to the range of Arabic characters that might be shaped. static inline int arabic_char(int c) @@ -13,4 +13,4 @@ int arabic_shape(int c, int *ccp, int *c1p, int prev_c, int prev_c1, int arabic_combine(int one, int two); int arabic_maycombine(int two); -#endif // NEOVIM_ARABIC_H +#endif // NVIM_ARABIC_H diff --git a/src/nvim/ascii.h b/src/nvim/ascii.h index cf488c56a7..258b798e5b 100644 --- a/src/nvim/ascii.h +++ b/src/nvim/ascii.h @@ -5,8 +5,8 @@ * Do ":help credits" in Vim to see a list of people who contributed. */ -#ifndef NEOVIM_ASCII_H -#define NEOVIM_ASCII_H +#ifndef NVIM_ASCII_H +#define NVIM_ASCII_H /* * Definitions of various common control characters. @@ -94,4 +94,4 @@ # define PATHSEPSTR "/" #endif -#endif /* NEOVIM_ASCII_H */ +#endif /* NVIM_ASCII_H */ diff --git a/src/nvim/blowfish.h b/src/nvim/blowfish.h index 288187f433..2d1d0ba1a0 100644 --- a/src/nvim/blowfish.h +++ b/src/nvim/blowfish.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_BLOWFISH_H -#define NEOVIM_BLOWFISH_H +#ifndef NVIM_BLOWFISH_H +#define NVIM_BLOWFISH_H void bf_key_init(char_u *password, char_u *salt, int salt_len); void bf_cfb_init(char_u *iv, int iv_len); @@ -10,4 +10,4 @@ void bf_crypt_save(void); void bf_crypt_restore(void); int blowfish_self_test(void); -#endif // NEOVIM_BLOWFISH_H +#endif // NVIM_BLOWFISH_H diff --git a/src/nvim/buffer.h b/src/nvim/buffer.h index 8c85d0363a..3462106aec 100644 --- a/src/nvim/buffer.h +++ b/src/nvim/buffer.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_BUFFER_H -#define NEOVIM_BUFFER_H +#ifndef NVIM_BUFFER_H +#define NVIM_BUFFER_H /* buffer.c */ int open_buffer(int read_stdin, exarg_T *eap, int flags); int buf_valid(buf_T *buf); @@ -78,4 +78,4 @@ void set_buflisted(int on); int buf_contents_changed(buf_T *buf); void wipe_buffer(buf_T *buf, int aucmd); -#endif /* NEOVIM_BUFFER_H */ +#endif /* NVIM_BUFFER_H */ diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h index 0f70e7e4ed..383cefc8d7 100644 --- a/src/nvim/buffer_defs.h +++ b/src/nvim/buffer_defs.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_BUFFER_DEFS_H -#define NEOVIM_BUFFER_DEFS_H +#ifndef NVIM_BUFFER_DEFS_H +#define NVIM_BUFFER_DEFS_H // for garray_T #include "nvim/garray.h" @@ -1078,4 +1078,4 @@ struct window_S { qf_info_T *w_llist_ref; }; -#endif // NEOVIM_BUFFER_DEFS_H +#endif // NVIM_BUFFER_DEFS_H diff --git a/src/nvim/charset.h b/src/nvim/charset.h index 169c83ccc1..f273ed4c96 100644 --- a/src/nvim/charset.h +++ b/src/nvim/charset.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_CHARSET_H -#define NEOVIM_CHARSET_H +#ifndef NVIM_CHARSET_H +#define NVIM_CHARSET_H int init_chartab(void); int buf_init_chartab(buf_T *buf, int global); @@ -63,4 +63,4 @@ int rem_backslash(char_u *str); void backslash_halve(char_u *p); char_u *backslash_halve_save(char_u *p); -#endif // NEOVIM_CHARSET_H +#endif // NVIM_CHARSET_H diff --git a/src/nvim/crypt.h b/src/nvim/crypt.h index 8794360dd5..388443787d 100644 --- a/src/nvim/crypt.h +++ b/src/nvim/crypt.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_CRYPT_H -#define NEOVIM_CRYPT_H +#ifndef NVIM_CRYPT_H +#define NVIM_CRYPT_H /// Returns the crypt method string as a number. /// @@ -79,4 +79,4 @@ void free_crypt_key(char_u *key); /// @return The crypt key. On failure, NULL is returned. char_u *get_crypt_key(int store, int twice); -#endif // NEOVIM_CRYPT_H +#endif // NVIM_CRYPT_H diff --git a/src/nvim/cursor_shape.h b/src/nvim/cursor_shape.h index 33a120e1c4..aaed73e025 100644 --- a/src/nvim/cursor_shape.h +++ b/src/nvim/cursor_shape.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_CURSOR_SHAPE_H -#define NEOVIM_CURSOR_SHAPE_H +#ifndef NVIM_CURSOR_SHAPE_H +#define NVIM_CURSOR_SHAPE_H /* * struct to store values from 'guicursor' and 'mouseshape' @@ -49,4 +49,4 @@ typedef struct cursor_entry { char_u *parse_shape_opt(int what); -#endif /* NEOVIM_CURSOR_SHAPE_H */ +#endif /* NVIM_CURSOR_SHAPE_H */ diff --git a/src/nvim/diff.h b/src/nvim/diff.h index 223fe8add2..f68fd03d46 100644 --- a/src/nvim/diff.h +++ b/src/nvim/diff.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_DIFF_H -#define NEOVIM_DIFF_H +#ifndef NVIM_DIFF_H +#define NVIM_DIFF_H void diff_buf_delete(buf_T *buf); void diff_buf_adjust(win_T *win); @@ -30,4 +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); -#endif // NEOVIM_DIFF_H +#endif // NVIM_DIFF_H diff --git a/src/nvim/digraph.h b/src/nvim/digraph.h index 796066bb68..afeaa49ec6 100644 --- a/src/nvim/digraph.h +++ b/src/nvim/digraph.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_DIGRAPH_H -#define NEOVIM_DIGRAPH_H +#ifndef NVIM_DIGRAPH_H +#define NVIM_DIGRAPH_H int do_digraph(int c); int get_digraph(int cmdline); @@ -9,4 +9,4 @@ void listdigraphs(void); char_u *keymap_init(void); void ex_loadkeymap(exarg_T *eap); -#endif // NEOVIM_DIGRAPH_H +#endif // NVIM_DIGRAPH_H diff --git a/src/nvim/edit.h b/src/nvim/edit.h index 152373590e..edd42800cc 100644 --- a/src/nvim/edit.h +++ b/src/nvim/edit.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_EDIT_H -#define NEOVIM_EDIT_H +#ifndef NVIM_EDIT_H +#define NVIM_EDIT_H #include "nvim/vim.h" @@ -55,4 +55,4 @@ int in_cinkeys(int keytyped, int when, int line_is_empty); int hkmap(int c); int ins_copychar(linenr_T lnum); -#endif /* NEOVIM_EDIT_H */ +#endif /* NVIM_EDIT_H */ diff --git a/src/nvim/eval.h b/src/nvim/eval.h index 20d6bfe119..30177b81e8 100644 --- a/src/nvim/eval.h +++ b/src/nvim/eval.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_EVAL_H -#define NEOVIM_EVAL_H +#ifndef NVIM_EVAL_H +#define NVIM_EVAL_H /* eval.c */ void eval_init(void); void eval_clear(void); @@ -149,4 +149,4 @@ int modify_fname(char_u *src, int *usedlen, char_u **fnamep, char_u *do_string_sub(char_u *str, char_u *pat, char_u *sub, char_u *flags); -#endif /* NEOVIM_EVAL_H */ +#endif /* NVIM_EVAL_H */ diff --git a/src/nvim/eval_defs.h b/src/nvim/eval_defs.h index b0661fd991..d2de830d6c 100644 --- a/src/nvim/eval_defs.h +++ b/src/nvim/eval_defs.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_EVAL_DEFS_H -#define NEOVIM_EVAL_DEFS_H +#ifndef NVIM_EVAL_DEFS_H +#define NVIM_EVAL_DEFS_H #include "nvim/hashtab.h" @@ -113,4 +113,4 @@ struct dictvar_S { dict_T *dv_used_prev; /* previous dict in used dicts list */ }; -#endif // NEOVIM_EVAL_DEFS_H +#endif // NVIM_EVAL_DEFS_H diff --git a/src/nvim/ex_cmds.h b/src/nvim/ex_cmds.h index f2cee3d7a0..eb96ac475d 100644 --- a/src/nvim/ex_cmds.h +++ b/src/nvim/ex_cmds.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_EX_CMDS_H -#define NEOVIM_EX_CMDS_H +#ifndef NVIM_EX_CMDS_H +#define NVIM_EX_CMDS_H /* ex_cmds.c */ void do_ascii(exarg_T *eap); @@ -72,4 +72,4 @@ 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); -#endif /* NEOVIM_EX_CMDS_H */ +#endif /* NVIM_EX_CMDS_H */ diff --git a/src/nvim/ex_cmds2.h b/src/nvim/ex_cmds2.h index 5a84206a0e..a99107b237 100644 --- a/src/nvim/ex_cmds2.h +++ b/src/nvim/ex_cmds2.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_EX_CMDS2_H -#define NEOVIM_EX_CMDS2_H +#ifndef NVIM_EX_CMDS2_H +#define NVIM_EX_CMDS2_H /* ex_cmds2.c */ void do_debug(char_u *cmd); void ex_debug(exarg_T *eap); @@ -92,4 +92,4 @@ void free_locales(void); char_u *get_lang_arg(expand_T *xp, int idx); char_u *get_locales(expand_T *xp, int idx); -#endif /* NEOVIM_EX_CMDS2_H */ +#endif /* NVIM_EX_CMDS2_H */ diff --git a/src/nvim/ex_docmd.h b/src/nvim/ex_docmd.h index 3cc134aab2..963e689e60 100644 --- a/src/nvim/ex_docmd.h +++ b/src/nvim/ex_docmd.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_EX_DOCMD_H -#define NEOVIM_EX_DOCMD_H +#ifndef NVIM_EX_DOCMD_H +#define NVIM_EX_DOCMD_H /* ex_docmd.c */ void do_exmode(int improved); int do_cmdline_cmd(char_u *cmd); @@ -66,4 +66,4 @@ 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); -#endif /* NEOVIM_EX_DOCMD_H */ +#endif /* NVIM_EX_DOCMD_H */ diff --git a/src/nvim/ex_eval.h b/src/nvim/ex_eval.h index 4fcf4760ff..6af82d3f3c 100644 --- a/src/nvim/ex_eval.h +++ b/src/nvim/ex_eval.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_EX_EVAL_H -#define NEOVIM_EX_EVAL_H +#ifndef NVIM_EX_EVAL_H +#define NVIM_EX_EVAL_H /* * A list used for saving values of "emsg_silent". Used by ex_try() to save the @@ -156,4 +156,4 @@ void rewind_conditionals(struct condstack *cstack, int idx, void ex_endfunction(exarg_T *eap); int has_loop_cmd(char_u *p); -#endif /* NEOVIM_EX_EVAL_H */ +#endif /* NVIM_EX_EVAL_H */ diff --git a/src/nvim/ex_getln.h b/src/nvim/ex_getln.h index 32980783b2..61a0fcaeb3 100644 --- a/src/nvim/ex_getln.h +++ b/src/nvim/ex_getln.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_EX_GETLN_H -#define NEOVIM_EX_GETLN_H +#ifndef NVIM_EX_GETLN_H +#define NVIM_EX_GETLN_H /* ex_getln.c */ char_u *getcmdline(int firstc, long count, int indent); char_u *getcmdline_prompt(int firstc, char_u *prompt, int attr, @@ -63,4 +63,4 @@ void cmd_pchar(int c, int offset); int cmd_gchar(int offset); char_u *script_get(exarg_T *eap, char_u *cmd); -#endif /* NEOVIM_EX_GETLN_H */ +#endif /* NVIM_EX_GETLN_H */ diff --git a/src/nvim/farsi.h b/src/nvim/farsi.h index 9206d7c3f9..779f7053ac 100644 --- a/src/nvim/farsi.h +++ b/src/nvim/farsi.h @@ -8,8 +8,8 @@ /// TyD (for types that look like _X_ e.g. _AYN_) /// TyE (for types that look like X e.g. RE) -#ifndef NEOVIM_FARSI_H -#define NEOVIM_FARSI_H +#ifndef NVIM_FARSI_H +#define NVIM_FARSI_H #include "nvim/normal.h" #include "nvim/types.h" @@ -180,4 +180,4 @@ int F_isdigit(int c); int F_ischar(int c); void farsi_fkey(cmdarg_T *cap); -#endif // NEOVIM_FARSI_H +#endif // NVIM_FARSI_H diff --git a/src/nvim/file_search.h b/src/nvim/file_search.h index 13c09a122d..5957fd1f9f 100644 --- a/src/nvim/file_search.h +++ b/src/nvim/file_search.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_FILE_SEARCH_H -#define NEOVIM_FILE_SEARCH_H +#ifndef NVIM_FILE_SEARCH_H +#define NVIM_FILE_SEARCH_H void *vim_findfile_init(char_u *path, char_u *filename, char_u * stopdirs, int level, int free_visited, @@ -20,4 +20,4 @@ char_u *find_file_in_path_option(char_u *ptr, int len, int options, int find_what, char_u *rel_fname, char_u *suffixes); -#endif /* NEOVIM_FILE_SEARCH_H */ +#endif /* NVIM_FILE_SEARCH_H */ diff --git a/src/nvim/fileio.h b/src/nvim/fileio.h index d97983e4d8..a69f3a287e 100644 --- a/src/nvim/fileio.h +++ b/src/nvim/fileio.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_FILEIO_H -#define NEOVIM_FILEIO_H +#ifndef NVIM_FILEIO_H +#define NVIM_FILEIO_H #include "nvim/buffer_defs.h" #include "nvim/os/os.h" @@ -91,4 +91,4 @@ char_u *file_pat_to_reg_pat(char_u *pat, char_u *pat_end, long read_eintr(int fd, void *buf, size_t bufsize); long write_eintr(int fd, void *buf, size_t bufsize); -#endif /* NEOVIM_FILEIO_H */ +#endif /* NVIM_FILEIO_H */ diff --git a/src/nvim/fold.h b/src/nvim/fold.h index 5023511e0d..6fb51e4cf0 100644 --- a/src/nvim/fold.h +++ b/src/nvim/fold.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_FOLD_H -#define NEOVIM_FOLD_H +#ifndef NVIM_FOLD_H +#define NVIM_FOLD_H /* * Info used to pass info about a fold from the fold-detection code to the @@ -62,4 +62,4 @@ char_u *get_foldtext(win_T *wp, linenr_T lnum, linenr_T lnume, void foldtext_cleanup(char_u *str); int put_folds(FILE *fd, win_T *wp); -#endif /* NEOVIM_FOLD_H */ +#endif /* NVIM_FOLD_H */ diff --git a/src/nvim/func_attr.h b/src/nvim/func_attr.h index 4275d23ff1..6e7149e8fb 100644 --- a/src/nvim/func_attr.h +++ b/src/nvim/func_attr.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_FUNC_ATTR_H -#define NEOVIM_FUNC_ATTR_H +#ifndef NVIM_FUNC_ATTR_H +#define NVIM_FUNC_ATTR_H // gcc and clang expose their version as follows: // @@ -107,4 +107,4 @@ #define FUNC_ATTR_NONNULL_RET #endif -#endif // NEOVIM_FUNC_ATTR_H +#endif // NVIM_FUNC_ATTR_H diff --git a/src/nvim/garray.h b/src/nvim/garray.h index 694d073f94..4ffd5879fe 100644 --- a/src/nvim/garray.h +++ b/src/nvim/garray.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_GARRAY_H -#define NEOVIM_GARRAY_H +#ifndef NVIM_GARRAY_H +#define NVIM_GARRAY_H #include "nvim/func_attr.h" @@ -28,4 +28,4 @@ void ga_concat(garray_T *gap, const char_u *restrict s); void ga_append(garray_T *gap, char c); void append_ga_line(garray_T *gap); -#endif // NEOVIM_GARRAY_H +#endif // NVIM_GARRAY_H diff --git a/src/nvim/getchar.h b/src/nvim/getchar.h index b91af5e7a6..527573bdab 100644 --- a/src/nvim/getchar.h +++ b/src/nvim/getchar.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_GETCHAR_H -#define NEOVIM_GETCHAR_H +#ifndef NVIM_GETCHAR_H +#define NVIM_GETCHAR_H /* getchar.c */ void free_buff(buffheader_T *buf); char_u *get_recorded(void); @@ -74,4 +74,4 @@ char_u *check_map(char_u *keys, int mode, int exact, int ign_mod, int *local_ptr); void add_map(char_u *map, int mode); -#endif /* NEOVIM_GETCHAR_H */ +#endif /* NVIM_GETCHAR_H */ diff --git a/src/nvim/globals.h b/src/nvim/globals.h index 36689c2c94..a2efb961cd 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -5,8 +5,8 @@ * Do ":help credits" in Vim to see a list of people who contributed. */ -#ifndef NEOVIM_GLOBALS_H -#define NEOVIM_GLOBALS_H +#ifndef NVIM_GLOBALS_H +#define NVIM_GLOBALS_H #include <stdbool.h> @@ -1137,4 +1137,4 @@ EXTERN char *ignoredp; * os_unix.c */ EXTERN int curr_tmode INIT(= TMODE_COOK); /* contains current terminal mode */ -#endif /* NEOVIM_GLOBALS_H */ +#endif /* NVIM_GLOBALS_H */ diff --git a/src/nvim/hardcopy.h b/src/nvim/hardcopy.h index 0ae206517b..8824c9bd7e 100644 --- a/src/nvim/hardcopy.h +++ b/src/nvim/hardcopy.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_HARDCOPY_H -#define NEOVIM_HARDCOPY_H +#ifndef NVIM_HARDCOPY_H +#define NVIM_HARDCOPY_H /* * Structure to hold printing color and font attributes. @@ -90,4 +90,4 @@ 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); -#endif /* NEOVIM_HARDCOPY_H */ +#endif /* NVIM_HARDCOPY_H */ diff --git a/src/nvim/hashtab.h b/src/nvim/hashtab.h index 4285358bea..118795efe6 100644 --- a/src/nvim/hashtab.h +++ b/src/nvim/hashtab.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_HASHTAB_H -#define NEOVIM_HASHTAB_H +#ifndef NVIM_HASHTAB_H +#define NVIM_HASHTAB_H /* Item for a hashtable. "hi_key" can be one of three values: * NULL: Never been used @@ -53,4 +53,4 @@ void hash_lock(hashtab_T *ht); void hash_unlock(hashtab_T *ht); hash_T hash_hash(char_u *key); -#endif /* NEOVIM_HASHTAB_H */ +#endif /* NVIM_HASHTAB_H */ diff --git a/src/nvim/if_cscope.h b/src/nvim/if_cscope.h index 74d4df83ea..32824a7e3d 100644 --- a/src/nvim/if_cscope.h +++ b/src/nvim/if_cscope.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_IF_CSCOPE_H -#define NEOVIM_IF_CSCOPE_H +#ifndef NVIM_IF_CSCOPE_H +#define NVIM_IF_CSCOPE_H /* if_cscope.c */ char_u *get_cscope_name(expand_T *xp, int idx); void set_context_in_cscope_cmd(expand_T *xp, char_u *arg, @@ -13,4 +13,4 @@ void cs_print_tags(void); int cs_connection(int num, char_u *dbpath, char_u *ppath); void cs_end(void); -#endif /* NEOVIM_IF_CSCOPE_H */ +#endif /* NVIM_IF_CSCOPE_H */ diff --git a/src/nvim/if_cscope_defs.h b/src/nvim/if_cscope_defs.h index 3c64067795..0ec9e30516 100644 --- a/src/nvim/if_cscope_defs.h +++ b/src/nvim/if_cscope_defs.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_IF_CSCOPE_DEFS_H -#define NEOVIM_IF_CSCOPE_DEFS_H +#ifndef NVIM_IF_CSCOPE_DEFS_H +#define NVIM_IF_CSCOPE_DEFS_H /* * CSCOPE support for Vim added by Andy Kahn <kahn@zk3.dec.com> @@ -68,4 +68,4 @@ typedef enum { Print } mcmd_e; -#endif // NEOVIM_IF_CSCOPE_DEFS_H +#endif // NVIM_IF_CSCOPE_DEFS_H diff --git a/src/nvim/indent.h b/src/nvim/indent.h index 8b1c96bf5a..c6fcba391f 100644 --- a/src/nvim/indent.h +++ b/src/nvim/indent.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_INDENT_H -#define NEOVIM_INDENT_H +#ifndef NVIM_INDENT_H +#define NVIM_INDENT_H #include "nvim/vim.h" int get_indent(void); int get_indent_lnum(linenr_T lnum); @@ -11,4 +11,4 @@ int get_number_indent(linenr_T lnum); int inindent(int extra); int get_expr_indent(void); int get_lisp_indent(void); -#endif // NEOVIM_INDENT_H +#endif // NVIM_INDENT_H diff --git a/src/nvim/indent_c.h b/src/nvim/indent_c.h index b2642958ea..4639bfe242 100644 --- a/src/nvim/indent_c.h +++ b/src/nvim/indent_c.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_INDENT_C_H -#define NEOVIM_INDENT_C_H +#ifndef NVIM_INDENT_C_H +#define NVIM_INDENT_C_H #include "nvim/vim.h" int cin_islabel(void); int cin_iscase(char_u *s, int strict); diff --git a/src/nvim/keymap.h b/src/nvim/keymap.h index 244e9b3ddf..7921b07904 100644 --- a/src/nvim/keymap.h +++ b/src/nvim/keymap.h @@ -5,8 +5,8 @@ * Do ":help credits" in Vim to see a list of people who contributed. */ -#ifndef NEOVIM_KEYMAP_H -#define NEOVIM_KEYMAP_H +#ifndef NVIM_KEYMAP_H +#define NVIM_KEYMAP_H /* * Keycode definitions for special keys. @@ -512,4 +512,4 @@ char_u *get_key_name(int i); int get_mouse_button(int code, int *is_click, int *is_drag); int get_pseudo_mouse_code(int button, int is_click, int is_drag); -#endif /* NEOVIM_KEYMAP_H */ +#endif /* NVIM_KEYMAP_H */ diff --git a/src/nvim/log.h b/src/nvim/log.h index 255808efbe..4177a0a3d5 100644 --- a/src/nvim/log.h +++ b/src/nvim/log.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_LOG_H -#define NEOVIM_LOG_H +#ifndef NVIM_LOG_H +#define NVIM_LOG_H #include <stdbool.h> @@ -53,5 +53,5 @@ bool do_log(int log_level, const char *func_name, int line_num, #endif -#endif // NEOVIM_LOG_H +#endif // NVIM_LOG_H diff --git a/src/nvim/macros.h b/src/nvim/macros.h index 9bfe3d054b..c8586efe63 100644 --- a/src/nvim/macros.h +++ b/src/nvim/macros.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_MACROS_H -#define NEOVIM_MACROS_H +#ifndef NVIM_MACROS_H +#define NVIM_MACROS_H /* * VIM - Vi IMproved by Bram Moolenaar @@ -148,4 +148,4 @@ # define RESET_BINDING(wp) (wp)->w_p_scb = FALSE; (wp)->w_p_crb = FALSE -#endif // NEOVIM_MACROS_H +#endif // NVIM_MACROS_H diff --git a/src/nvim/main.h b/src/nvim/main.h index 8a40d12126..92e0fcbc9a 100644 --- a/src/nvim/main.h +++ b/src/nvim/main.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_MAIN_H -#define NEOVIM_MAIN_H +#ifndef NVIM_MAIN_H +#define NVIM_MAIN_H #include "nvim/normal.h" @@ -13,4 +13,4 @@ void time_msg(char *mesg, void *tv_start); char_u *eval_client_expr_to_string(char_u *expr); char_u *serverConvert(char_u *client_enc, char_u *data, char_u **tofree); -#endif /* NEOVIM_MAIN_H */ +#endif /* NVIM_MAIN_H */ diff --git a/src/nvim/map.h b/src/nvim/map.h index 32dde0fad2..7b4c03ffa0 100644 --- a/src/nvim/map.h +++ b/src/nvim/map.h @@ -1,6 +1,6 @@ // General-purpose string->pointer associative array with a simple API -#ifndef NEOVIM_MAP_H -#define NEOVIM_MAP_H +#ifndef NVIM_MAP_H +#define NVIM_MAP_H #include <stdbool.h> @@ -53,5 +53,5 @@ void *map_del(Map *map, const char *key); /// @param cb A function that will be called for each key/value void map_foreach(Map *map, key_value_cb cb); -#endif /* NEOVIM_MAP_H */ +#endif /* NVIM_MAP_H */ diff --git a/src/nvim/map_defs.h b/src/nvim/map_defs.h index d732b0fa66..e56a1461d4 100644 --- a/src/nvim/map_defs.h +++ b/src/nvim/map_defs.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_MAP_DEFS_H -#define NEOVIM_MAP_DEFS_H +#ifndef NVIM_MAP_DEFS_H +#define NVIM_MAP_DEFS_H typedef struct map Map; @@ -10,5 +10,5 @@ typedef struct map Map; /// @param value A value typedef void (*key_value_cb)(Map *map, const char *key, void *value); -#endif /* NEOVIM_MAP_DEFS_H */ +#endif /* NVIM_MAP_DEFS_H */ diff --git a/src/nvim/mark.h b/src/nvim/mark.h index 9de8aef828..1fcbb0304c 100644 --- a/src/nvim/mark.h +++ b/src/nvim/mark.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_MARK_H -#define NEOVIM_MARK_H +#ifndef NVIM_MARK_H +#define NVIM_MARK_H #include "nvim/buffer_defs.h" #include "nvim/mark_defs.h" @@ -39,4 +39,4 @@ int write_viminfo_marks(FILE *fp_out); void copy_viminfo_marks(vir_T *virp, FILE *fp_out, int count, int eof, int flags); -#endif /* NEOVIM_MARK_H */ +#endif /* NVIM_MARK_H */ diff --git a/src/nvim/mark_defs.h b/src/nvim/mark_defs.h index a67fbc2945..c6f2e46bb0 100644 --- a/src/nvim/mark_defs.h +++ b/src/nvim/mark_defs.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_MARK_DEFS_H -#define NEOVIM_MARK_DEFS_H +#ifndef NVIM_MARK_DEFS_H +#define NVIM_MARK_DEFS_H #include "nvim/pos.h" @@ -26,4 +26,4 @@ typedef struct xfilemark { char_u *fname; /* file name, used when fnum == 0 */ } xfmark_T; -#endif // NEOVIM_MARK_DEFS_H +#endif // NVIM_MARK_DEFS_H diff --git a/src/nvim/mbyte.h b/src/nvim/mbyte.h index 896b7fbaa0..aad0eba401 100644 --- a/src/nvim/mbyte.h +++ b/src/nvim/mbyte.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_MBYTE_H -#define NEOVIM_MBYTE_H +#ifndef NVIM_MBYTE_H +#define NVIM_MBYTE_H /* mbyte.c */ int enc_canon_props(char_u *name); char_u *mb_init(void); @@ -84,4 +84,4 @@ 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); -#endif /* NEOVIM_MBYTE_H */ +#endif /* NVIM_MBYTE_H */ diff --git a/src/nvim/memfile.h b/src/nvim/memfile.h index ae1f4fdd27..5f21bdaf4f 100644 --- a/src/nvim/memfile.h +++ b/src/nvim/memfile.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_MEMFILE_H -#define NEOVIM_MEMFILE_H +#ifndef NVIM_MEMFILE_H +#define NVIM_MEMFILE_H #include "nvim/buffer_defs.h" #include "nvim/memfile_defs.h" @@ -22,4 +22,4 @@ void mf_set_ffname(memfile_T *mfp); void mf_fullname(memfile_T *mfp); int mf_need_trans(memfile_T *mfp); -#endif /* NEOVIM_MEMFILE_H */ +#endif /* NVIM_MEMFILE_H */ diff --git a/src/nvim/memfile_defs.h b/src/nvim/memfile_defs.h index e614cae7ca..5a37103f62 100644 --- a/src/nvim/memfile_defs.h +++ b/src/nvim/memfile_defs.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_MEMFILE_DEFS_H -#define NEOVIM_MEMFILE_DEFS_H +#ifndef NVIM_MEMFILE_DEFS_H +#define NVIM_MEMFILE_DEFS_H typedef struct block_hdr bhdr_T; typedef long blocknr_T; @@ -104,4 +104,4 @@ struct memfile { char_u mf_old_seed[MF_SEED_LEN]; }; -#endif // NEOVIM_MEMFILE_DEFS_H +#endif // NVIM_MEMFILE_DEFS_H diff --git a/src/nvim/memline.h b/src/nvim/memline.h index 40bfb69996..99f2638e72 100644 --- a/src/nvim/memline.h +++ b/src/nvim/memline.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_MEMLINE_H -#define NEOVIM_MEMLINE_H +#ifndef NVIM_MEMLINE_H +#define NVIM_MEMLINE_H #include "nvim/types.h" #include "nvim/func_attr.h" @@ -44,4 +44,4 @@ void ml_decrypt_data(memfile_T *mfp, char_u *data, off_t offset, long ml_find_line_or_offset(buf_T *buf, linenr_T lnum, long *offp); void goto_byte(long cnt); -#endif /* NEOVIM_MEMLINE_H */ +#endif /* NVIM_MEMLINE_H */ diff --git a/src/nvim/memline_defs.h b/src/nvim/memline_defs.h index 100a923843..bcc1c673d2 100644 --- a/src/nvim/memline_defs.h +++ b/src/nvim/memline_defs.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_MEMLINE_DEFS_H -#define NEOVIM_MEMLINE_DEFS_H +#ifndef NVIM_MEMLINE_DEFS_H +#define NVIM_MEMLINE_DEFS_H #include "nvim/memfile_defs.h" @@ -56,4 +56,4 @@ typedef struct memline { int ml_usedchunks; } memline_T; -#endif // NEOVIM_MEMLINE_DEFS_H +#endif // NVIM_MEMLINE_DEFS_H diff --git a/src/nvim/memory.h b/src/nvim/memory.h index 9c6f5a1b1d..cd25aa9fd0 100644 --- a/src/nvim/memory.h +++ b/src/nvim/memory.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_MEMORY_H -#define NEOVIM_MEMORY_H +#ifndef NVIM_MEMORY_H +#define NVIM_MEMORY_H #include "nvim/func_attr.h" #include "nvim/types.h" diff --git a/src/nvim/menu.h b/src/nvim/menu.h index 04e21cdd54..2e84d0107a 100644 --- a/src/nvim/menu.h +++ b/src/nvim/menu.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_MENU_H -#define NEOVIM_MENU_H +#ifndef NVIM_MENU_H +#define NVIM_MENU_H /* Indices into vimmenu_T->strings[] and vimmenu_T->noremap[] for each mode */ #define MENU_INDEX_INVALID -1 @@ -62,4 +62,4 @@ void ex_emenu(exarg_T *eap); vimmenu_T *gui_find_menu(char_u *path_name); void ex_menutranslate(exarg_T *eap); -#endif /* NEOVIM_MENU_H */ +#endif /* NVIM_MENU_H */ diff --git a/src/nvim/message.h b/src/nvim/message.h index 2db9bfc85c..11029aa6fd 100644 --- a/src/nvim/message.h +++ b/src/nvim/message.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_MESSAGE_H -#define NEOVIM_MESSAGE_H +#ifndef NVIM_MESSAGE_H +#define NVIM_MESSAGE_H /* message.c */ int msg(char_u *s); int verb_msg(char_u *s); @@ -82,4 +82,4 @@ char_u *do_browse(int flags, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter, buf_T *buf); -#endif /* NEOVIM_MESSAGE_H */ +#endif /* NVIM_MESSAGE_H */ diff --git a/src/nvim/misc1.h b/src/nvim/misc1.h index 7ace8dffcf..7d9cd4ab63 100644 --- a/src/nvim/misc1.h +++ b/src/nvim/misc1.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_MISC1_H -#define NEOVIM_MISC1_H +#ifndef NVIM_MISC1_H +#define NVIM_MISC1_H #include "nvim/vim.h" @@ -73,4 +73,4 @@ char_u *get_cmd_output(char_u *cmd, char_u *infile, int flags); void FreeWild(int count, char_u **files); int goto_im(void); -#endif /* NEOVIM_MISC1_H */ +#endif /* NVIM_MISC1_H */ diff --git a/src/nvim/misc2.h b/src/nvim/misc2.h index a0a4ec694c..71a55bb94a 100644 --- a/src/nvim/misc2.h +++ b/src/nvim/misc2.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_MISC2_H -#define NEOVIM_MISC2_H +#ifndef NVIM_MISC2_H +#define NVIM_MISC2_H #include "nvim/func_attr.h" #include "nvim/os/shell.h" @@ -48,4 +48,4 @@ 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); -#endif /* NEOVIM_MISC2_H */ +#endif /* NVIM_MISC2_H */ diff --git a/src/nvim/move.h b/src/nvim/move.h index 571b0a7743..5e961661eb 100644 --- a/src/nvim/move.h +++ b/src/nvim/move.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_MOVE_H -#define NEOVIM_MOVE_H +#ifndef NVIM_MOVE_H +#define NVIM_MOVE_H /* move.c */ void update_topline_redraw(void); void update_topline(void); @@ -40,4 +40,4 @@ int onepage(int dir, long count); void halfpage(int flag, linenr_T Prenum); void do_check_cursorbind(void); -#endif /* NEOVIM_MOVE_H */ +#endif /* NVIM_MOVE_H */ diff --git a/src/nvim/normal.h b/src/nvim/normal.h index 5ee7e08a46..522ecf5b02 100644 --- a/src/nvim/normal.h +++ b/src/nvim/normal.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_NORMAL_H -#define NEOVIM_NORMAL_H +#ifndef NVIM_NORMAL_H +#define NVIM_NORMAL_H #include "nvim/pos.h" @@ -83,4 +83,4 @@ int get_visual_text(cmdarg_T *cap, char_u **pp, int *lenp); void start_selection(void); void may_start_select(int c); -#endif /* NEOVIM_NORMAL_H */ +#endif /* NVIM_NORMAL_H */ diff --git a/src/nvim/ops.h b/src/nvim/ops.h index 93a221fd7e..83175eb89d 100644 --- a/src/nvim/ops.h +++ b/src/nvim/ops.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_OPS_H -#define NEOVIM_OPS_H +#ifndef NVIM_OPS_H +#define NVIM_OPS_H #include "nvim/func_attr.h" #include "nvim/types.h" @@ -60,4 +60,4 @@ void write_reg_contents_ex(int name, char_u *str, int maxlen, void clear_oparg(oparg_T *oap); void cursor_pos_info(void); -#endif /* NEOVIM_OPS_H */ +#endif /* NVIM_OPS_H */ diff --git a/src/nvim/option.h b/src/nvim/option.h index ec27e1b493..cf0214c5c8 100644 --- a/src/nvim/option.h +++ b/src/nvim/option.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_OPTION_H -#define NEOVIM_OPTION_H +#ifndef NVIM_OPTION_H +#define NVIM_OPTION_H #include <stdint.h> @@ -78,4 +78,4 @@ long get_sts_value(void); void find_mps_values(int *initc, int *findc, int *backwards, int switchit); -#endif /* NEOVIM_OPTION_H */ +#endif /* NVIM_OPTION_H */ diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h index 1cb1f2ebca..3cb96e46a8 100644 --- a/src/nvim/option_defs.h +++ b/src/nvim/option_defs.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_OPTION_DEFS_H -#define NEOVIM_OPTION_DEFS_H +#ifndef NVIM_OPTION_DEFS_H +#define NVIM_OPTION_DEFS_H #include "nvim/types.h" @@ -767,4 +767,4 @@ enum { /* Value for b_p_ul indicating the global value must be used. */ #define NO_LOCAL_UNDOLEVEL -123456 -#endif // NEOVIM_OPTION_DEFS_H +#endif // NVIM_OPTION_DEFS_H diff --git a/src/nvim/os/channel.h b/src/nvim/os/channel.h index 6dd0288279..4a3962575d 100644 --- a/src/nvim/os/channel.h +++ b/src/nvim/os/channel.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_OS_CHANNEL_H -#define NEOVIM_OS_CHANNEL_H +#ifndef NVIM_OS_CHANNEL_H +#define NVIM_OS_CHANNEL_H #include <uv.h> @@ -25,5 +25,5 @@ void channel_from_stream(uv_stream_t *stream, ChannelProtocol prot); /// @param prot The rpc protocol used void channel_from_job(char **argv, ChannelProtocol prot); -#endif // NEOVIM_OS_CHANNEL_H +#endif // NVIM_OS_CHANNEL_H diff --git a/src/nvim/os/channel_defs.h b/src/nvim/os/channel_defs.h index 27ba103fbe..9763e0f284 100644 --- a/src/nvim/os/channel_defs.h +++ b/src/nvim/os/channel_defs.h @@ -1,8 +1,8 @@ -#ifndef NEOVIM_OS_CHANNEL_DEFS_H -#define NEOVIM_OS_CHANNEL_DEFS_H +#ifndef NVIM_OS_CHANNEL_DEFS_H +#define NVIM_OS_CHANNEL_DEFS_H typedef enum { kChannelProtocolMsgpack } ChannelProtocol; -#endif // NEOVIM_OS_CHANNEL_DEFS_H +#endif // NVIM_OS_CHANNEL_DEFS_H diff --git a/src/nvim/os/event.h b/src/nvim/os/event.h index 9f1c2e5449..345ddba27e 100644 --- a/src/nvim/os/event.h +++ b/src/nvim/os/event.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_OS_EVENT_H -#define NEOVIM_OS_EVENT_H +#ifndef NVIM_OS_EVENT_H +#define NVIM_OS_EVENT_H #include <stdint.h> #include <stdbool.h> @@ -14,5 +14,5 @@ bool event_is_pending(void); void event_push(Event event); void event_process(void); -#endif // NEOVIM_OS_EVENT_H +#endif // NVIM_OS_EVENT_H diff --git a/src/nvim/os/event_defs.h b/src/nvim/os/event_defs.h index c5de8b9ece..983b70be97 100644 --- a/src/nvim/os/event_defs.h +++ b/src/nvim/os/event_defs.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_OS_EVENT_DEFS_H -#define NEOVIM_OS_EVENT_DEFS_H +#ifndef NVIM_OS_EVENT_DEFS_H +#define NVIM_OS_EVENT_DEFS_H #include "nvim/os/job_defs.h" #include "nvim/os/rstream_defs.h" @@ -22,4 +22,4 @@ typedef struct { } data; } Event; -#endif // NEOVIM_OS_EVENT_DEFS_H +#endif // NVIM_OS_EVENT_DEFS_H diff --git a/src/nvim/os/input.h b/src/nvim/os/input.h index 9ffd50fd3f..298df04578 100644 --- a/src/nvim/os/input.h +++ b/src/nvim/os/input.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_OS_INPUT_H -#define NEOVIM_OS_INPUT_H +#ifndef NVIM_OS_INPUT_H +#define NVIM_OS_INPUT_H #include <stdint.h> #include <stdbool.h> @@ -19,5 +19,5 @@ void os_breakcheck(void); /// @return `true` if file descriptor refers to a terminal. bool os_isatty(int fd); -#endif // NEOVIM_OS_INPUT_H +#endif // NVIM_OS_INPUT_H diff --git a/src/nvim/os/job.h b/src/nvim/os/job.h index e73ecc1223..4ddbc75807 100644 --- a/src/nvim/os/job.h +++ b/src/nvim/os/job.h @@ -4,8 +4,8 @@ // the job's std{in,out,err}. They are more like bash/zsh co-processes than the // usual shell background job. The name 'Job' was chosen because it applies to // the concept while being significantly shorter. -#ifndef NEOVIM_OS_JOB_H -#define NEOVIM_OS_JOB_H +#ifndef NVIM_OS_JOB_H +#define NVIM_OS_JOB_H #include <stdint.h> #include <stdbool.h> @@ -74,5 +74,5 @@ int job_id(Job *job); /// @return The job data void *job_data(Job *job); -#endif // NEOVIM_OS_JOB_H +#endif // NVIM_OS_JOB_H diff --git a/src/nvim/os/job_defs.h b/src/nvim/os/job_defs.h index 13bc2f3ab0..8e4dc0cd88 100644 --- a/src/nvim/os/job_defs.h +++ b/src/nvim/os/job_defs.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_OS_JOB_DEFS_H -#define NEOVIM_OS_JOB_DEFS_H +#ifndef NVIM_OS_JOB_DEFS_H +#define NVIM_OS_JOB_DEFS_H #include "nvim/os/rstream_defs.h" @@ -11,5 +11,5 @@ typedef struct job Job; /// @param data Some data associated with the job by the caller typedef void (*job_exit_cb)(Job *job, void *data); -#endif // NEOVIM_OS_JOB_DEFS_H +#endif // NVIM_OS_JOB_DEFS_H diff --git a/src/nvim/os/msgpack_rpc.h b/src/nvim/os/msgpack_rpc.h index 8c1c9bcd7b..af2334f6dc 100644 --- a/src/nvim/os/msgpack_rpc.h +++ b/src/nvim/os/msgpack_rpc.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_OS_MSGPACK_RPC_H -#define NEOVIM_OS_MSGPACK_RPC_H +#ifndef NVIM_OS_MSGPACK_RPC_H +#define NVIM_OS_MSGPACK_RPC_H #include <stdint.h> #include <stdbool.h> @@ -103,5 +103,5 @@ void msgpack_rpc_free_array(Array value); void msgpack_rpc_free_dictionary(Dictionary value); -#endif // NEOVIM_OS_MSGPACK_RPC_H +#endif // NVIM_OS_MSGPACK_RPC_H diff --git a/src/nvim/os/os.h b/src/nvim/os/os.h index 7a1ecf4e34..fa040d29bd 100644 --- a/src/nvim/os/os.h +++ b/src/nvim/os/os.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_OS_OS_H -#define NEOVIM_OS_OS_H +#ifndef NVIM_OS_OS_H +#define NVIM_OS_OS_H #include <uv.h> #include "nvim/vim.h" @@ -143,4 +143,4 @@ bool os_get_file_info_fd(int file_descriptor, FileInfo *file_info); /// @return `true` if the two FileInfos represent the same file. bool os_file_info_id_equal(FileInfo *file_info_1, FileInfo *file_info_2); -#endif // NEOVIM_OS_OS_H +#endif // NVIM_OS_OS_H diff --git a/src/nvim/os/rstream.h b/src/nvim/os/rstream.h index ee0098204e..7a565099b7 100644 --- a/src/nvim/os/rstream.h +++ b/src/nvim/os/rstream.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_OS_RSTREAM_H -#define NEOVIM_OS_RSTREAM_H +#ifndef NVIM_OS_RSTREAM_H +#define NVIM_OS_RSTREAM_H #include <stdbool.h> #include <stdint.h> @@ -78,5 +78,5 @@ size_t rstream_available(RStream *rstream); /// @param event Object containing data necessary to invoke the callback void rstream_read_event(Event event); -#endif // NEOVIM_OS_RSTREAM_H +#endif // NVIM_OS_RSTREAM_H diff --git a/src/nvim/os/rstream_defs.h b/src/nvim/os/rstream_defs.h index 3d1dbec34f..5c7183c4c3 100644 --- a/src/nvim/os/rstream_defs.h +++ b/src/nvim/os/rstream_defs.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_OS_RSTREAM_DEFS_H -#define NEOVIM_OS_RSTREAM_DEFS_H +#ifndef NVIM_OS_RSTREAM_DEFS_H +#define NVIM_OS_RSTREAM_DEFS_H #include <stdbool.h> @@ -12,5 +12,5 @@ typedef struct rstream RStream; /// @param eof If the stream reached EOF. typedef void (*rstream_cb)(RStream *rstream, void *data, bool eof); -#endif // NEOVIM_OS_RSTREAM_DEFS_H +#endif // NVIM_OS_RSTREAM_DEFS_H diff --git a/src/nvim/os/server.h b/src/nvim/os/server.h index 0a5e798e8b..541746eb5f 100644 --- a/src/nvim/os/server.h +++ b/src/nvim/os/server.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_OS_SERVER_H -#define NEOVIM_OS_SERVER_H +#ifndef NVIM_OS_SERVER_H +#define NVIM_OS_SERVER_H #include "nvim/os/channel_defs.h" @@ -26,5 +26,5 @@ void server_start(char *endpoint, ChannelProtocol prot); /// @param endpoint Address of the server. void server_stop(char *endpoint); -#endif // NEOVIM_OS_SERVER_H +#endif // NVIM_OS_SERVER_H diff --git a/src/nvim/os/server_defs.h b/src/nvim/os/server_defs.h index cbaefe3949..08cdf55428 100644 --- a/src/nvim/os/server_defs.h +++ b/src/nvim/os/server_defs.h @@ -1,7 +1,7 @@ -#ifndef NEOVIM_OS_SERVER_DEFS_H -#define NEOVIM_OS_SERVER_DEFS_H +#ifndef NVIM_OS_SERVER_DEFS_H +#define NVIM_OS_SERVER_DEFS_H typedef struct server Server; -#endif // NEOVIM_OS_SERVER_DEFS_H +#endif // NVIM_OS_SERVER_DEFS_H diff --git a/src/nvim/os/shell.h b/src/nvim/os/shell.h index 9e64be35bf..226ef97579 100644 --- a/src/nvim/os/shell.h +++ b/src/nvim/os/shell.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_OS_SHELL_H -#define NEOVIM_OS_SHELL_H +#ifndef NVIM_OS_SHELL_H +#define NVIM_OS_SHELL_H #include <stdbool.h> @@ -41,5 +41,5 @@ void shell_free_argv(char **argv); /// @param extra_shell_arg Extra argument to be passed to the shell int os_call_shell(char_u *cmd, ShellOpts opts, char_u *extra_shell_arg); -#endif // NEOVIM_OS_SHELL_H +#endif // NVIM_OS_SHELL_H diff --git a/src/nvim/os/signal.h b/src/nvim/os/signal.h index 7f4c24c89b..6a0ad5e9ac 100644 --- a/src/nvim/os/signal.h +++ b/src/nvim/os/signal.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_OS_SIGNAL_H -#define NEOVIM_OS_SIGNAL_H +#ifndef NVIM_OS_SIGNAL_H +#define NVIM_OS_SIGNAL_H #include "nvim/os/event_defs.h" @@ -9,5 +9,5 @@ void signal_accept_deadly(void); void signal_reject_deadly(void); void signal_handle(Event event); -#endif // NEOVIM_OS_SIGNAL_H +#endif // NVIM_OS_SIGNAL_H diff --git a/src/nvim/os/time.h b/src/nvim/os/time.h index ef795d03be..02fd77551e 100644 --- a/src/nvim/os/time.h +++ b/src/nvim/os/time.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_OS_TIME_H -#define NEOVIM_OS_TIME_H +#ifndef NVIM_OS_TIME_H +#define NVIM_OS_TIME_H #include <stdint.h> #include <stdbool.h> @@ -31,5 +31,5 @@ struct tm *os_localtime_r(const time_t *clock, struct tm *result); /// argument) or NULL in case of error struct tm *os_get_localtime(struct tm *result); -#endif // NEOVIM_OS_TIME_H +#endif // NVIM_OS_TIME_H diff --git a/src/nvim/os/uv_helpers.h b/src/nvim/os/uv_helpers.h index eed2c55c3a..03fd64457f 100644 --- a/src/nvim/os/uv_helpers.h +++ b/src/nvim/os/uv_helpers.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_OS_UV_HELPERS_H -#define NEOVIM_OS_UV_HELPERS_H +#ifndef NVIM_OS_UV_HELPERS_H +#define NVIM_OS_UV_HELPERS_H #include <uv.h> @@ -43,5 +43,5 @@ Job *handle_get_job(uv_handle_t *handle); /// @param job the Job pointer void handle_set_job(uv_handle_t *handle, Job *job); -#endif // NEOVIM_OS_UV_HELPERS_H +#endif // NVIM_OS_UV_HELPERS_H diff --git a/src/nvim/os/wstream.h b/src/nvim/os/wstream.h index ab41991e87..a12d26fd5e 100644 --- a/src/nvim/os/wstream.h +++ b/src/nvim/os/wstream.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_OS_WSTREAM_H -#define NEOVIM_OS_WSTREAM_H +#ifndef NVIM_OS_WSTREAM_H +#define NVIM_OS_WSTREAM_H #include <stdint.h> #include <stdbool.h> @@ -36,5 +36,5 @@ void wstream_set_stream(WStream *wstream, uv_stream_t *stream); /// @return true if the data was successfully queued, false otherwise. bool wstream_write(WStream *wstream, char *buffer, uint32_t length, bool free); -#endif // NEOVIM_OS_WSTREAM_H +#endif // NVIM_OS_WSTREAM_H diff --git a/src/nvim/os/wstream_defs.h b/src/nvim/os/wstream_defs.h index 59d57365fa..e044ecfd8e 100644 --- a/src/nvim/os/wstream_defs.h +++ b/src/nvim/os/wstream_defs.h @@ -1,7 +1,7 @@ -#ifndef NEOVIM_OS_WSTREAM_DEFS_H -#define NEOVIM_OS_WSTREAM_DEFS_H +#ifndef NVIM_OS_WSTREAM_DEFS_H +#define NVIM_OS_WSTREAM_DEFS_H typedef struct wstream WStream; -#endif // NEOVIM_OS_WSTREAM_DEFS_H +#endif // NVIM_OS_WSTREAM_DEFS_H diff --git a/src/nvim/os_unix.h b/src/nvim/os_unix.h index e3e255d7c2..0180677717 100644 --- a/src/nvim/os_unix.h +++ b/src/nvim/os_unix.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_OS_UNIX_H -#define NEOVIM_OS_UNIX_H +#ifndef NVIM_OS_UNIX_H +#define NVIM_OS_UNIX_H #include "nvim/os/shell.h" @@ -43,4 +43,4 @@ int mch_libcall(char_u *libname, char_u *funcname, char_u *argstring, int argint, char_u **string_result, int *number_result); -#endif /* NEOVIM_OS_UNIX_H */ +#endif /* NVIM_OS_UNIX_H */ diff --git a/src/nvim/os_unix_defs.h b/src/nvim/os_unix_defs.h index 96fc7ff32e..a4bb1ef296 100644 --- a/src/nvim/os_unix_defs.h +++ b/src/nvim/os_unix_defs.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_OS_UNIX_DEFS_H -#define NEOVIM_OS_UNIX_DEFS_H +#ifndef NVIM_OS_UNIX_DEFS_H +#define NVIM_OS_UNIX_DEFS_H /* * VIM - Vi IMproved by Bram Moolenaar @@ -281,4 +281,4 @@ /* We have three kinds of ACL support. */ #define HAVE_ACL (HAVE_POSIX_ACL || HAVE_SOLARIS_ACL || HAVE_AIX_ACL) -#endif // NEOVIM_OS_UNIX_DEFS_H +#endif // NVIM_OS_UNIX_DEFS_H diff --git a/src/nvim/path.h b/src/nvim/path.h index ac7cddf11d..9272922c8a 100644 --- a/src/nvim/path.h +++ b/src/nvim/path.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_PATH_H -#define NEOVIM_PATH_H +#ifndef NVIM_PATH_H +#define NVIM_PATH_H #include "nvim/func_attr.h" #include "nvim/types.h" diff --git a/src/nvim/popupmnu.h b/src/nvim/popupmnu.h index bed355245a..0607e93622 100644 --- a/src/nvim/popupmnu.h +++ b/src/nvim/popupmnu.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_POPUPMNU_H -#define NEOVIM_POPUPMNU_H +#ifndef NVIM_POPUPMNU_H +#define NVIM_POPUPMNU_H /// Used for popup menu items. typedef struct { @@ -16,4 +16,4 @@ void pum_clear(void); int pum_visible(void); int pum_get_height(void); -#endif // NEOVIM_POPUPMNU_H +#endif // NVIM_POPUPMNU_H diff --git a/src/nvim/pos.h b/src/nvim/pos.h index df6e0e5c39..dd647e52e4 100644 --- a/src/nvim/pos.h +++ b/src/nvim/pos.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_POS_H -#define NEOVIM_POS_H +#ifndef NVIM_POS_H +#define NVIM_POS_H /* * position in file or buffer @@ -20,4 +20,4 @@ typedef struct { colnr_T col; /* column number */ } lpos_T; -#endif /* NEOVIM_POS_H */ +#endif /* NVIM_POS_H */ diff --git a/src/nvim/proto.h b/src/nvim/proto.h index 0177b52f28..d628e1f998 100644 --- a/src/nvim/proto.h +++ b/src/nvim/proto.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_PROTO_H -#define NEOVIM_PROTO_H +#ifndef NVIM_PROTO_H +#define NVIM_PROTO_H /* * VIM - Vi IMproved by Bram Moolenaar @@ -46,4 +46,4 @@ int vim_vsnprintf(char *str, size_t str_m, char *fmt, va_list ap, typval_T *tvs) #endif /* !PROTO && !NOPROTO */ -#endif // NEOVIM_PROTO_H +#endif // NVIM_PROTO_H diff --git a/src/nvim/quickfix.h b/src/nvim/quickfix.h index ae53137ce8..b4869ac35c 100644 --- a/src/nvim/quickfix.h +++ b/src/nvim/quickfix.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_QUICKFIX_H -#define NEOVIM_QUICKFIX_H +#ifndef NVIM_QUICKFIX_H +#define NVIM_QUICKFIX_H /* quickfix.c */ int qf_init(win_T *wp, char_u *efile, char_u *errorformat, int newlist, char_u *qf_title); @@ -33,4 +33,4 @@ void ex_cbuffer(exarg_T *eap); void ex_cexpr(exarg_T *eap); void ex_helpgrep(exarg_T *eap); -#endif /* NEOVIM_QUICKFIX_H */ +#endif /* NVIM_QUICKFIX_H */ diff --git a/src/nvim/regexp.h b/src/nvim/regexp.h index 8d4c921b37..64f664985a 100644 --- a/src/nvim/regexp.h +++ b/src/nvim/regexp.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_REGEXP_H -#define NEOVIM_REGEXP_H +#ifndef NVIM_REGEXP_H +#define NVIM_REGEXP_H /* regexp.c */ int re_multiline(regprog_T *prog); char_u *skip_regexp(char_u *startp, int dirc, int magic, char_u **newp); @@ -24,4 +24,4 @@ long vim_regexec_multi(regmmatch_T *rmp, win_T *win, buf_T *buf, linenr_T lnum, colnr_T col, proftime_T *tm); -#endif /* NEOVIM_REGEXP_H */ +#endif /* NVIM_REGEXP_H */ diff --git a/src/nvim/regexp_defs.h b/src/nvim/regexp_defs.h index c638a7276f..25c69c5267 100644 --- a/src/nvim/regexp_defs.h +++ b/src/nvim/regexp_defs.h @@ -9,8 +9,8 @@ * NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE */ -#ifndef NEOVIM_REGEXP_DEFS_H -#define NEOVIM_REGEXP_DEFS_H +#ifndef NVIM_REGEXP_DEFS_H +#define NVIM_REGEXP_DEFS_H #include "nvim/pos.h" @@ -146,4 +146,4 @@ struct regengine { #endif }; -#endif // NEOVIM_REGEXP_DEFS_H +#endif // NVIM_REGEXP_DEFS_H diff --git a/src/nvim/screen.h b/src/nvim/screen.h index 9ac6174d18..d0f66710fc 100644 --- a/src/nvim/screen.h +++ b/src/nvim/screen.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_SCREEN_H -#define NEOVIM_SCREEN_H +#ifndef NVIM_SCREEN_H +#define NVIM_SCREEN_H /* screen.c */ void redraw_later(int type); void redraw_win_later(win_T *wp, int type); @@ -65,4 +65,4 @@ int number_width(win_T *wp); int screen_screencol(void); int screen_screenrow(void); -#endif /* NEOVIM_SCREEN_H */ +#endif /* NVIM_SCREEN_H */ diff --git a/src/nvim/search.h b/src/nvim/search.h index d0137dcd78..122fdce04c 100644 --- a/src/nvim/search.h +++ b/src/nvim/search.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_SEARCH_H -#define NEOVIM_SEARCH_H +#ifndef NVIM_SEARCH_H +#define NVIM_SEARCH_H /* search.c */ int search_regcomp(char_u *pat, int pat_save, int pat_use, int options, regmmatch_T *regmatch); @@ -49,4 +49,4 @@ void find_pattern_in_path(char_u *ptr, int dir, int len, int whole, int read_viminfo_search_pattern(vir_T *virp, int force); void write_viminfo_search_pattern(FILE *fp); -#endif /* NEOVIM_SEARCH_H */ +#endif /* NVIM_SEARCH_H */ diff --git a/src/nvim/sha256.h b/src/nvim/sha256.h index b8d6bf5c76..0df4746167 100644 --- a/src/nvim/sha256.h +++ b/src/nvim/sha256.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_SHA256_H -#define NEOVIM_SHA256_H +#ifndef NVIM_SHA256_H +#define NVIM_SHA256_H typedef struct { uint32_t total[2]; @@ -15,4 +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); -#endif // NEOVIM_SHA256_H +#endif // NVIM_SHA256_H diff --git a/src/nvim/sign_defs.h b/src/nvim/sign_defs.h index be33a57fff..7288a48e21 100644 --- a/src/nvim/sign_defs.h +++ b/src/nvim/sign_defs.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_SIGN_DEFS_H -#define NEOVIM_SIGN_DEFS_H +#ifndef NVIM_SIGN_DEFS_H +#define NVIM_SIGN_DEFS_H // signs: line annotations @@ -21,4 +21,4 @@ struct signlist -#endif // NEOVIM_SIGN_DEFS_H +#endif // NVIM_SIGN_DEFS_H diff --git a/src/nvim/spell.h b/src/nvim/spell.h index 9662c8e6f2..ac0f904b4f 100644 --- a/src/nvim/spell.h +++ b/src/nvim/spell.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_SPELL_H -#define NEOVIM_SPELL_H +#ifndef NVIM_SPELL_H +#define NVIM_SPELL_H int spell_check(win_T *wp, char_u *ptr, hlf_T *attrp, int *capcol, int docount); @@ -30,4 +30,4 @@ 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); -#endif // NEOVIM_SPELL_H +#endif // NVIM_SPELL_H diff --git a/src/nvim/strings.h b/src/nvim/strings.h index 2a4fd19fb9..831191b517 100644 --- a/src/nvim/strings.h +++ b/src/nvim/strings.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_STRINGS_H -#define NEOVIM_STRINGS_H +#ifndef NVIM_STRINGS_H +#define NVIM_STRINGS_H char_u *vim_strsave(char_u *string); char_u *vim_strnsave(char_u *string, int len); char_u *vim_strsave_escaped(char_u *string, char_u *esc_chars); diff --git a/src/nvim/syntax.h b/src/nvim/syntax.h index 1146ffe6ec..f9b57993d9 100644 --- a/src/nvim/syntax.h +++ b/src/nvim/syntax.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_SYNTAX_H -#define NEOVIM_SYNTAX_H +#ifndef NVIM_SYNTAX_H +#define NVIM_SYNTAX_H #include "nvim/buffer_defs.h" @@ -55,4 +55,4 @@ 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); -#endif /* NEOVIM_SYNTAX_H */ +#endif /* NVIM_SYNTAX_H */ diff --git a/src/nvim/syntax_defs.h b/src/nvim/syntax_defs.h index 820b81ee92..f2b9d3e336 100644 --- a/src/nvim/syntax_defs.h +++ b/src/nvim/syntax_defs.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_SYNTAX_DEFS_H -#define NEOVIM_SYNTAX_DEFS_H +#ifndef NVIM_SYNTAX_DEFS_H +#define NVIM_SYNTAX_DEFS_H #include "nvim/regexp_defs.h" @@ -75,4 +75,4 @@ typedef struct attr_entry { } ae_u; } attrentry_T; -#endif // NEOVIM_SYNTAX_DEFS_H +#endif // NVIM_SYNTAX_DEFS_H diff --git a/src/nvim/tag.h b/src/nvim/tag.h index a5e1b4d491..91a2ebe849 100644 --- a/src/nvim/tag.h +++ b/src/nvim/tag.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_TAG_H -#define NEOVIM_TAG_H +#ifndef NVIM_TAG_H +#define NVIM_TAG_H /* * Structure used for get_tagfname(). @@ -25,4 +25,4 @@ int expand_tags(int tagnames, char_u *pat, int *num_file, char_u ***file); int get_tags(list_T *list, char_u *pat); -#endif /* NEOVIM_TAG_H */ +#endif /* NVIM_TAG_H */ diff --git a/src/nvim/term.h b/src/nvim/term.h index 547b729e6e..20d46e179b 100644 --- a/src/nvim/term.h +++ b/src/nvim/term.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_TERM_H -#define NEOVIM_TERM_H +#ifndef NVIM_TERM_H +#define NVIM_TERM_H /* term.c */ int set_termname(char_u *term); void set_mouse_termcode(int n, char_u *s); @@ -60,4 +60,4 @@ int find_term_bykeys(char_u *src); 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); -#endif /* NEOVIM_TERM_H */ +#endif /* NVIM_TERM_H */ diff --git a/src/nvim/term_defs.h b/src/nvim/term_defs.h index ed341adc8e..757792ea7c 100644 --- a/src/nvim/term_defs.h +++ b/src/nvim/term_defs.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_TERM_DEFS_H -#define NEOVIM_TERM_DEFS_H +#ifndef NVIM_TERM_DEFS_H +#define NVIM_TERM_DEFS_H /* * VIM - Vi IMproved by Bram Moolenaar @@ -157,4 +157,4 @@ extern char_u *(term_strings[]); /* current terminal strings */ #define TMODE_SLEEP 1 /* terminal mode for sleeping (cooked but no echo) */ #define TMODE_RAW 2 /* terminal mode for Normal and Insert mode */ -#endif // NEOVIM_TERM_DEFS_H +#endif // NVIM_TERM_DEFS_H diff --git a/src/nvim/types.h b/src/nvim/types.h index 14ffd9fbb7..3bc6bfb9bf 100644 --- a/src/nvim/types.h +++ b/src/nvim/types.h @@ -5,8 +5,8 @@ * Do ":help credits" in Vim to see a list of people who contributed. */ -#ifndef NEOVIM_TYPES_H -#define NEOVIM_TYPES_H +#ifndef NVIM_TYPES_H +#define NVIM_TYPES_H #include <stdint.h> @@ -16,4 +16,4 @@ */ typedef unsigned char char_u; -#endif /* NEOVIM_TYPES_H */ +#endif /* NVIM_TYPES_H */ diff --git a/src/nvim/ui.h b/src/nvim/ui.h index aed242c262..d9c3acc5f8 100644 --- a/src/nvim/ui.h +++ b/src/nvim/ui.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_UI_H -#define NEOVIM_UI_H +#ifndef NVIM_UI_H +#define NVIM_UI_H /* ui.c */ void ui_write(char_u *s, int len); int ui_inchar(char_u *buf, int maxlen, long wtime, int tb_change_cnt); @@ -26,4 +26,4 @@ int jump_to_mouse(int flags, int *inclusive, int which_button); int mouse_comp_pos(win_T *win, int *rowp, int *colp, linenr_T *lnump); win_T *mouse_find_win(int *rowp, int *colp); void im_save_status(long *psave); -#endif /* NEOVIM_UI_H */ +#endif /* NVIM_UI_H */ diff --git a/src/nvim/undo.h b/src/nvim/undo.h index c019d8856e..5f37a5849e 100644 --- a/src/nvim/undo.h +++ b/src/nvim/undo.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_UNDO_H -#define NEOVIM_UNDO_H +#ifndef NVIM_UNDO_H +#define NVIM_UNDO_H #include "nvim/undo_defs.h" @@ -33,4 +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); -#endif /* NEOVIM_UNDO_H */ +#endif /* NVIM_UNDO_H */ diff --git a/src/nvim/undo_defs.h b/src/nvim/undo_defs.h index 25097b3160..6263dd91d4 100644 --- a/src/nvim/undo_defs.h +++ b/src/nvim/undo_defs.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_UNDO_DEFS_H -#define NEOVIM_UNDO_DEFS_H +#ifndef NVIM_UNDO_DEFS_H +#define NVIM_UNDO_DEFS_H #include "nvim/pos.h" @@ -65,4 +65,4 @@ struct u_header { #define UH_CHANGED 0x01 /* b_changed flag before undo/after redo */ #define UH_EMPTYBUF 0x02 /* buffer was empty */ -#endif // NEOVIM_UNDO_DEFS_H +#endif // NVIM_UNDO_DEFS_H diff --git a/src/nvim/version.h b/src/nvim/version.h index f5699bfdf6..e98e8c1eeb 100644 --- a/src/nvim/version.h +++ b/src/nvim/version.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_VERSION_H -#define NEOVIM_VERSION_H +#ifndef NVIM_VERSION_H +#define NVIM_VERSION_H int highest_patch(void); int has_patch(int n); @@ -9,4 +9,4 @@ void maybe_intro_message(void); void intro_message(int colon); void ex_intro(exarg_T *eap); -#endif // NEOVIM_VERSION_H +#endif // NVIM_VERSION_H diff --git a/src/nvim/version_defs.h b/src/nvim/version_defs.h index 87487c2624..65dbfc8581 100644 --- a/src/nvim/version_defs.h +++ b/src/nvim/version_defs.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_VERSION_DEFS_H -#define NEOVIM_VERSION_DEFS_H +#ifndef NVIM_VERSION_DEFS_H +#define NVIM_VERSION_DEFS_H /* * VIM - Vi IMproved by Bram Moolenaar @@ -44,4 +44,4 @@ /* Displayed on splash screen. */ #define MODIFIED_BY "the Neovim contributors." -#endif // NEOVIM_VERSION_DEFS_H +#endif // NVIM_VERSION_DEFS_H diff --git a/src/nvim/vim.h b/src/nvim/vim.h index 73ad6c42b8..4444bd8a2a 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -5,8 +5,8 @@ * Do ":help credits" in Vim to see a list of people who contributed. */ -#ifndef NEOVIM_VIM_H -# define NEOVIM_VIM_H +#ifndef NVIM_VIM_H +# define NVIM_VIM_H #include "nvim/types.h" @@ -1388,4 +1388,4 @@ typedef int VimClipboard; /* This is required for the prototypes. */ # define SET_NO_HLSEARCH(flag) no_hlsearch = (flag); set_vim_var_nr( \ VV_HLSEARCH, !no_hlsearch) -#endif /* NEOVIM_VIM_H */ +#endif /* NVIM_VIM_H */ diff --git a/src/nvim/window.h b/src/nvim/window.h index 86a5bba2b4..34bc2fc30e 100644 --- a/src/nvim/window.h +++ b/src/nvim/window.h @@ -1,5 +1,5 @@ -#ifndef NEOVIM_WINDOW_H -#define NEOVIM_WINDOW_H +#ifndef NVIM_WINDOW_H +#define NVIM_WINDOW_H /* window.c */ void do_window(int nchar, long Prenum, int xchar); int win_split(int size, int flags); @@ -82,4 +82,4 @@ int match_add(win_T *wp, char_u *grp, char_u *pat, int prio, int id); int match_delete(win_T *wp, int id, int perr); void clear_matches(win_T *wp); matchitem_T *get_match(win_T *wp, int id); -#endif /* NEOVIM_WINDOW_H */ +#endif /* NVIM_WINDOW_H */ |