To: vim-dev@vim.org Subject: Patch 5.6.093 (extra) Fcc: outbox From: Bram Moolenaar ------------ Patch 5.6.093 (extra) Problem: Win32 GUI: "ls | gvim -" will show a message box about reading stdin when Vim exits. (Donohue) Solution: Don't write a message about the file read from stdin until the GUI has started. Files: src/fileio.c *** ../vim-5.6.92/src/fileio.c Mon Jun 5 19:03:00 2000 --- src/fileio.c Tue Jun 6 19:27:58 2000 *************** *** 471,488 **** * still be running, don't move the cursor to the last line, unless * always using the GUI. */ - #ifndef ALWAYS_USE_GUI if (read_stdin) { mch_msg("Vim: Reading from stdin...\n"); ! # ifdef USE_GUI /* Also write a message in the GUI window, if there is one. */ if (gui.in_use) gui_write((char_u *)"Reading from stdin...", 21); ! # endif } else - #endif filemess(curbuf, sfname, (char_u *)"", 0); } --- 477,494 ---- * still be running, don't move the cursor to the last line, unless * always using the GUI. */ if (read_stdin) { + #ifndef ALWAYS_USE_GUI mch_msg("Vim: Reading from stdin...\n"); ! #endif ! #ifdef USE_GUI /* Also write a message in the GUI window, if there is one. */ if (gui.in_use) gui_write((char_u *)"Reading from stdin...", 21); ! #endif } else filemess(curbuf, sfname, (char_u *)"", 0); } *************** *** 951,957 **** c = TRUE; msg_add_lines(c, (long)linecnt, filesize); ! keep_msg = msg_trunc_attr(IObuff, FALSE, 0); keep_msg_attr = 0; if (read_stdin) { --- 957,970 ---- c = TRUE; msg_add_lines(c, (long)linecnt, filesize); ! #ifdef ALWAYS_USE_GUI ! /* Don't show the message when reading stdin, it would end up in a ! * message box (which might be shown when exiting!) */ ! if (read_stdin) ! keep_msg = msg_may_trunc(FALSE, IObuff); ! else ! #endif ! keep_msg = msg_trunc_attr(IObuff, FALSE, 0); keep_msg_attr = 0; if (read_stdin) { *** ../vim-5.6.92/src/version.c Tue Jun 6 15:38:57 2000 --- src/version.c Tue Jun 6 19:30:02 2000 *************** *** 420,421 **** --- 420,423 ---- { /* Add new patch number below this line */ + /**/ + 93, /**/ -- Any resemblance between the above views and those of my employer, my terminal, or the view out my window are purely coincidental. Any resemblance between the above and my own views is non-deterministic. The question of the existence of views in the absence of anyone to hold them is left as an exercise for the reader. The question of the existence of the reader is left as an exercise for the second god coefficient. (A discussion of non-orthogonal, non-integral polytheism is beyond the scope of this article.) (Ralph Jennings) /-/-- Bram Moolenaar --- Bram@moolenaar.net --- http://www.moolenaar.net --\-\ \-\-- Vim: http://www.vim.org ---- ICCF Holland: http://www.vim.org/iccf --/-/