aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.0203

Browse Source
This commit is contained in:
Bram Moolenaar
2006-02-21 22:04:51 +00:00
parent 030f0dfad5
commit 8f7fd65b24
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/fileio.c
View File

@@ -2318,16 +2318,13 @@ failed:
p = msg_trunc_attr(IObuff, FALSE, 0); p = msg_trunc_attr(IObuff, FALSE, 0);
if (read_stdin || read_buffer || restart_edit != 0 if (read_stdin || read_buffer || restart_edit != 0
|| (msg_scrolled != 0 && !need_wait_return)) || (msg_scrolled != 0 && !need_wait_return))
{
/* Need to repeat the message after redrawing when: /* Need to repeat the message after redrawing when:
* - When reading from stdin (the screen will be cleared next). * - When reading from stdin (the screen will be cleared next).
* - When restart_edit is set (otherwise there will be a delay * - When restart_edit is set (otherwise there will be a delay
* before redrawing). * before redrawing).
* - When the screen was scrolled but there is no wait-return * - When the screen was scrolled but there is no wait-return
* prompt. */ * prompt. */
set_keep_msg(p); set_keep_msg(p, 0);
keep_msg_attr = 0;
}
msg_scrolled_ign = FALSE; msg_scrolled_ign = FALSE;
} }
@@ -2335,6 +2332,7 @@ failed:
if (newfile && (error if (newfile && (error
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
|| conv_error != 0 || conv_error != 0
|| (illegal_byte > 0 && bad_char_behavior != BAD_KEEP)
#endif #endif
)) ))
curbuf->b_p_ro = TRUE; curbuf->b_p_ro = TRUE;
@@ -4377,8 +4375,7 @@ restore_backup:
STRCAT(IObuff, shortmess(SHM_WRI) ? _(" [w]") : _(" written")); STRCAT(IObuff, shortmess(SHM_WRI) ? _(" [w]") : _(" written"));
} }
set_keep_msg(msg_trunc_attr(IObuff, FALSE, 0)); set_keep_msg(msg_trunc_attr(IObuff, FALSE, 0), 0);
keep_msg_attr = 0;
} }
/* When written everything correctly: reset 'modified'. Unless not /* When written everything correctly: reset 'modified'. Unless not

3
src/proto/message.pro
View File

@@ -16,7 +16,8 @@ int delete_first_msg __ARGS((void));
void ex_messages __ARGS((exarg_T *eap)); void ex_messages __ARGS((exarg_T *eap));
void msg_end_prompt __ARGS((void)); void msg_end_prompt __ARGS((void));
void wait_return __ARGS((int redraw)); void wait_return __ARGS((int redraw));
void set_keep_msg __ARGS((char_u *s)); void set_keep_msg __ARGS((char_u *s, int attr));
void set_keep_msg_from_hist __ARGS((void));
void msg_start __ARGS((void)); void msg_start __ARGS((void));
void msg_starthere __ARGS((void)); void msg_starthere __ARGS((void));
void msg_putchar __ARGS((int c)); void msg_putchar __ARGS((int c));