diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-01-15 09:59:45 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-01-15 09:59:45 -0500 |
| commit | 5c6348e9995b0dde23a2de99263e9e0e3a72fcd2 (patch) | |
| tree | 9640f1bb8888959d4a34db04a5e06d9bde48ed7b /src/nvim/fileio.c | |
| parent | 5f24549ab1ecd69236be2761a2e43690ba7cf283 (diff) | |
| parent | d2e7cce560932e5e8032656598b0e27e1c06ec0d (diff) | |
| download | rneovim-5c6348e9995b0dde23a2de99263e9e0e3a72fcd2.tar.gz rneovim-5c6348e9995b0dde23a2de99263e9e0e3a72fcd2.tar.bz2 rneovim-5c6348e9995b0dde23a2de99263e9e0e3a72fcd2.zip | |
Merge pull request #1816 from Pyrohh/macro_cleanup
Macro cleanup
Diffstat (limited to 'src/nvim/fileio.c')
| -rw-r--r-- | src/nvim/fileio.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 58e67fa58c..370584b095 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -636,14 +636,12 @@ readfile ( #endif } -#if defined(HAS_SWAP_EXISTS_ACTION) /* If "Quit" selected at ATTENTION dialog, don't load the file */ if (swap_exists_action == SEA_QUIT) { if (!read_buffer && !read_stdin) close(fd); return FAIL; } -#endif ++no_wait_return; /* don't wait for return yet */ @@ -5149,7 +5147,7 @@ void write_lnum_adjust(linenr_T offset) curbuf->b_no_eol_lnum += offset; } -#if defined(BACKSLASH_IN_FILENAME) || defined(PROTO) +#if defined(BACKSLASH_IN_FILENAME) /* * Convert all backslashes in fname to forward slashes in-place. */ @@ -5547,7 +5545,7 @@ void do_augroup(char_u *arg, int del_group) } } -#if defined(EXITFREE) || defined(PROTO) +#if defined(EXITFREE) void free_all_autocmds(void) { for (current_augroup = -1; current_augroup < augroups.ga_len; @@ -7454,7 +7452,7 @@ file_pat_to_reg_pat ( return reg_pat; } -#if defined(EINTR) || defined(PROTO) +#if defined(EINTR) /* * Version of read() that retries when interrupted by EINTR (possibly * by a SIGWINCH). |