comparison src/fileio.c @ 679:e629de7618da

updated for version 7.0203
author vimboss
date Tue, 21 Feb 2006 22:04:51 +0000
parents 9cdb8018cdf1
children 9364d114ed8d
comparison
equal deleted inserted replaced
678:93a1bf1cb633 679:e629de7618da
2316 else 2316 else
2317 #endif 2317 #endif
2318 p = msg_trunc_attr(IObuff, FALSE, 0); 2318 p = msg_trunc_attr(IObuff, FALSE, 0);
2319 if (read_stdin || read_buffer || restart_edit != 0 2319 if (read_stdin || read_buffer || restart_edit != 0
2320 || (msg_scrolled != 0 && !need_wait_return)) 2320 || (msg_scrolled != 0 && !need_wait_return))
2321 {
2322 /* Need to repeat the message after redrawing when: 2321 /* Need to repeat the message after redrawing when:
2323 * - When reading from stdin (the screen will be cleared next). 2322 * - When reading from stdin (the screen will be cleared next).
2324 * - When restart_edit is set (otherwise there will be a delay 2323 * - When restart_edit is set (otherwise there will be a delay
2325 * before redrawing). 2324 * before redrawing).
2326 * - When the screen was scrolled but there is no wait-return 2325 * - When the screen was scrolled but there is no wait-return
2327 * prompt. */ 2326 * prompt. */
2328 set_keep_msg(p); 2327 set_keep_msg(p, 0);
2329 keep_msg_attr = 0;
2330 }
2331 msg_scrolled_ign = FALSE; 2328 msg_scrolled_ign = FALSE;
2332 } 2329 }
2333 2330
2334 /* with errors writing the file requires ":w!" */ 2331 /* with errors writing the file requires ":w!" */
2335 if (newfile && (error 2332 if (newfile && (error
2336 #ifdef FEAT_MBYTE 2333 #ifdef FEAT_MBYTE
2337 || conv_error != 0 2334 || conv_error != 0
2335 || (illegal_byte > 0 && bad_char_behavior != BAD_KEEP)
2338 #endif 2336 #endif
2339 )) 2337 ))
2340 curbuf->b_p_ro = TRUE; 2338 curbuf->b_p_ro = TRUE;
2341 2339
2342 u_clearline(); /* cannot use "U" command after adding lines */ 2340 u_clearline(); /* cannot use "U" command after adding lines */
4375 STRCAT(IObuff, shortmess(SHM_WRI) ? _(" [a]") : _(" appended")); 4373 STRCAT(IObuff, shortmess(SHM_WRI) ? _(" [a]") : _(" appended"));
4376 else 4374 else
4377 STRCAT(IObuff, shortmess(SHM_WRI) ? _(" [w]") : _(" written")); 4375 STRCAT(IObuff, shortmess(SHM_WRI) ? _(" [w]") : _(" written"));
4378 } 4376 }
4379 4377
4380 set_keep_msg(msg_trunc_attr(IObuff, FALSE, 0)); 4378 set_keep_msg(msg_trunc_attr(IObuff, FALSE, 0), 0);
4381 keep_msg_attr = 0;
4382 } 4379 }
4383 4380
4384 /* When written everything correctly: reset 'modified'. Unless not 4381 /* When written everything correctly: reset 'modified'. Unless not
4385 * writing to the original file and '+' is not in 'cpoptions'. */ 4382 * writing to the original file and '+' is not in 'cpoptions'. */
4386 if (reset_changed && whole && !append 4383 if (reset_changed && whole && !append