aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/memline.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2014-05-28 13:09:50 -0400
committerJustin M. Keyes <justinkz@gmail.com>2014-05-28 13:09:59 -0400
commit3972f6cde741a03eb04a413f61983f2d768127c2 (patch)
tree42bedb0a0915fd82e809c6c23b812518ebd872ac /src/nvim/memline.c
parent3dddceedceebb73b93d399f2c56b0f1b5394c645 (diff)
parent6fc28397950f367f4b9e5b56b9d135dde2410e76 (diff)
downloadrneovim-3972f6cde741a03eb04a413f61983f2d768127c2.tar.gz
rneovim-3972f6cde741a03eb04a413f61983f2d768127c2.tar.bz2
rneovim-3972f6cde741a03eb04a413f61983f2d768127c2.zip
Merge #500 'Remove/simplify #ifdefs on default features'
Diffstat (limited to 'src/nvim/memline.c')
-rw-r--r--src/nvim/memline.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/nvim/memline.c b/src/nvim/memline.c
index c831727a0a..2526f9d98b 100644
--- a/src/nvim/memline.c
+++ b/src/nvim/memline.c
@@ -1501,7 +1501,7 @@ static char_u *make_percent_swname(char_u *dir, char_u *name)
}
#endif
-#if defined(UNIX) && (defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG))
+#ifdef UNIX
static int process_still_running;
#endif
@@ -2437,7 +2437,6 @@ static int ml_delete_int(buf_T *buf, linenr_T lnum, int message)
)
set_keep_msg((char_u *)_(no_lines_msg), 0);
- /* FEAT_BYTEOFF already handled in there, don't worry 'bout it below */
i = ml_replace((linenr_T)1, (char_u *)"", TRUE);
buf->b_ml.ml_flags |= ML_EMPTY;
@@ -3406,7 +3405,7 @@ findswapname (
int choice = 0;
#endif
-#if defined(UNIX) && (defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG))
+#ifdef UNIX
process_still_running = FALSE;
#endif
/*