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/buffer.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/buffer.c')
| -rw-r--r-- | src/nvim/buffer.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 58310a22a4..3a378ea360 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -602,7 +602,6 @@ void goto_buffer(exarg_T *eap, int start, int dir, int count) { (void)do_buffer(*eap->cmd == 's' ? DOBUF_SPLIT : DOBUF_GOTO, start, dir, count, eap->forceit); -#ifdef HAS_SWAP_EXISTS_ACTION buf_T *old_curbuf = curbuf; swap_exists_action = SEA_DIALOG; @@ -624,10 +623,8 @@ void goto_buffer(exarg_T *eap, int start, int dir, int count) } else { handle_swap_exists(old_curbuf); } -#endif } -#if defined(HAS_SWAP_EXISTS_ACTION) || defined(PROTO) /* * Handle the situation of swap_exists_action being set. * It is allowed for "old_curbuf" to be NULL or invalid. @@ -678,7 +675,6 @@ void handle_swap_exists(buf_T *old_curbuf) } swap_exists_action = SEA_NONE; } -#endif /* * do_bufdel() - delete or unload buffer(s) @@ -2351,7 +2347,7 @@ int buflist_add(char_u *fname, int flags) return 0; } -#if defined(BACKSLASH_IN_FILENAME) || defined(PROTO) +#if defined(BACKSLASH_IN_FILENAME) /* * Adjust slashes in file names. Called after 'shellslash' was set. */ @@ -2752,7 +2748,7 @@ void resettitle(void) mch_settitle(lasttitle, lasticon); } -# if defined(EXITFREE) || defined(PROTO) +# if defined(EXITFREE) void free_titles(void) { free(lasttitle); @@ -3934,17 +3930,12 @@ void ex_buffer_all(exarg_T *eap) continue; /* Open the buffer in this window. */ -#if defined(HAS_SWAP_EXISTS_ACTION) swap_exists_action = SEA_DIALOG; -#endif set_curbuf(buf, DOBUF_GOTO); if (!buf_valid(buf)) { /* autocommands deleted the buffer!!! */ -#if defined(HAS_SWAP_EXISTS_ACTION) swap_exists_action = SEA_NONE; -# endif break; } -#if defined(HAS_SWAP_EXISTS_ACTION) if (swap_exists_action == SEA_QUIT) { cleanup_T cs; @@ -3964,7 +3955,6 @@ void ex_buffer_all(exarg_T *eap) leave_cleanup(&cs); } else handle_swap_exists(NULL); -#endif } os_breakcheck(); |