diff options
Diffstat (limited to 'src/memline.c')
| -rw-r--r-- | src/memline.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/memline.c b/src/memline.c index bf1e91e4f..f7c68b2da 100644 --- a/src/memline.c +++ b/src/memline.c @@ -2038,7 +2038,7 @@ make_percent_swname(char_u *dir, char_u *name) } #endif -#if (defined(UNIX) || defined(__EMX__) || defined(VMS)) && (defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)) +#if (defined(UNIX) || defined(VMS)) && (defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)) static int process_still_running; #endif @@ -2126,7 +2126,7 @@ swapfile_info(char_u *fname) { MSG_PUTS(_("\n process ID: ")); msg_outnum(char_to_long(b0.b0_pid)); -#if defined(UNIX) || defined(__EMX__) +#if defined(UNIX) /* EMX kill() not working correctly, it seems */ if (kill((pid_t)char_to_long(b0.b0_pid), 0) == 0) { @@ -4445,7 +4445,7 @@ findswapname( } #endif -#if (defined(UNIX) || defined(__EMX__) || defined(VMS)) && (defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)) +#if (defined(UNIX) || defined(VMS)) && (defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)) process_still_running = FALSE; #endif #ifdef FEAT_AUTOCMD @@ -4497,13 +4497,13 @@ findswapname( name == NULL ? (char_u *)_("Swap file already exists!") : name, -# if defined(UNIX) || defined(__EMX__) || defined(VMS) +# if defined(UNIX) || defined(VMS) process_still_running ? (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Quit\n&Abort") : # endif (char_u *)_("&Open Read-Only\n&Edit anyway\n&Recover\n&Delete it\n&Quit\n&Abort"), 1, NULL, FALSE); -# if defined(UNIX) || defined(__EMX__) || defined(VMS) +# if defined(UNIX) || defined(VMS) if (process_still_running && choice >= 4) choice++; /* Skip missing "Delete it" button */ # endif |