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/memline.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/memline.c')
| -rw-r--r-- | src/nvim/memline.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/nvim/memline.c b/src/nvim/memline.c index f6246c8b57..1fa6d6acc6 100644 --- a/src/nvim/memline.c +++ b/src/nvim/memline.c @@ -3000,7 +3000,7 @@ static void ml_lineadd(buf_T *buf, int count) } } -#if defined(HAVE_READLINK) || defined(PROTO) +#if defined(HAVE_READLINK) /* * Resolve a symlink in the last component of a file name. * Note that f_resolve() does it for every part of the path, we don't do that @@ -3367,9 +3367,7 @@ findswapname ( * for the current file, and the buffer was not recovered. */ if (differ == FALSE && !(curbuf->b_flags & BF_RECOVERED) && vim_strchr(p_shm, SHM_ATTENTION) == NULL) { -#if defined(HAS_SWAP_EXISTS_ACTION) int choice = 0; -#endif #ifdef UNIX process_still_running = FALSE; @@ -3427,7 +3425,6 @@ findswapname ( redraw_all_later(NOT_VALID); } -#if defined(HAS_SWAP_EXISTS_ACTION) if (choice > 0) { switch (choice) { case 1: @@ -3454,7 +3451,6 @@ findswapname ( if (!os_file_exists(fname)) break; } else -#endif { MSG_PUTS("\n"); if (msg_silent == 0) |