To: vim_dev@googlegroups.com Subject: Patch 7.4.1570 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1570 Problem: There is no way to avoid the message when editing a file. Solution: Add the "F" flag to 'shortmess'. (Shougo, closes #686) Files: runtime/doc/options.txt, src/buffer.c, src/ex_cmds.c, src/option.h *** ../vim-7.4.1569/runtime/doc/options.txt 2016-02-21 23:01:47.449323306 +0100 --- runtime/doc/options.txt 2016-03-15 15:04:45.540421778 +0100 *************** *** 6516,6522 **** c don't give |ins-completion-menu| messages. For example, "-- XXX completion (YYY)", "match 1 of 2", "The only match", "Pattern not found", "Back at original", etc. ! q use "recording" instead of "recording @a" This gives you the opportunity to avoid that a change between buffers requires you to hit , but still gives as useful a message as --- 6533,6541 ---- c don't give |ins-completion-menu| messages. For example, "-- XXX completion (YYY)", "match 1 of 2", "The only match", "Pattern not found", "Back at original", etc. ! q use "recording" instead of "recording @a" ! F don't give the file info when editing a file, like `:silent` ! was used for the command This gives you the opportunity to avoid that a change between buffers requires you to hit , but still gives as useful a message as *** ../vim-7.4.1569/src/buffer.c 2016-03-08 12:56:29.000024462 +0100 --- src/buffer.c 2016-03-15 15:08:02.718371747 +0100 *************** *** 139,152 **** --- 139,157 ---- #endif ) { + int old_msg_silent = msg_silent; + #ifdef FEAT_NETBEANS_INTG int oldFire = netbeansFireChanges; netbeansFireChanges = 0; #endif + if (shortmess(SHM_FILEINFO)) + msg_silent = 1; retval = readfile(curbuf->b_ffname, curbuf->b_fname, (linenr_T)0, (linenr_T)0, (linenr_T)MAXLNUM, eap, flags | READ_NEW); + msg_silent = old_msg_silent; #ifdef FEAT_NETBEANS_INTG netbeansFireChanges = oldFire; #endif *** ../vim-7.4.1569/src/ex_cmds.c 2016-03-15 13:44:07.938807343 +0100 --- src/ex_cmds.c 2016-03-15 15:08:49.933880808 +0100 *************** *** 2605,2611 **** return; } /* print full file name if :cd used */ ! fileinfo(FALSE, FALSE, eap->forceit); } /* --- 2605,2612 ---- return; } /* print full file name if :cd used */ ! if (!shortmess(SHM_FILEINFO)) ! fileinfo(FALSE, FALSE, eap->forceit); } /* *************** *** 3884,3890 **** msg_scroll = msg_scroll_save; msg_scrolled_ign = TRUE; ! fileinfo(FALSE, TRUE, FALSE); msg_scrolled_ign = FALSE; } --- 3885,3892 ---- msg_scroll = msg_scroll_save; msg_scrolled_ign = TRUE; ! if (!shortmess(SHM_FILEINFO)) ! fileinfo(FALSE, TRUE, FALSE); msg_scrolled_ign = FALSE; } *** ../vim-7.4.1569/src/option.h 2016-03-08 22:47:05.622161011 +0100 --- src/option.h 2016-03-15 14:27:50.051442630 +0100 *************** *** 214,220 **** #define SHM_INTRO 'I' /* intro messages */ #define SHM_COMPLETIONMENU 'c' /* completion menu messages */ #define SHM_RECORDING 'q' /* short recording message */ ! #define SHM_ALL "rmfixlnwaWtToOsAIcq" /* all possible flags for 'shm' */ /* characters for p_go: */ #define GO_ASEL 'a' /* autoselect */ --- 214,221 ---- #define SHM_INTRO 'I' /* intro messages */ #define SHM_COMPLETIONMENU 'c' /* completion menu messages */ #define SHM_RECORDING 'q' /* short recording message */ ! #define SHM_FILEINFO 'F' /* no file info messages */ ! #define SHM_ALL "rmfixlnwaWtToOsAIcqF" /* all possible flags for 'shm' */ /* characters for p_go: */ #define GO_ASEL 'a' /* autoselect */ *** ../vim-7.4.1569/src/version.c 2016-03-15 14:10:54.478025751 +0100 --- src/version.c 2016-03-15 14:28:48.466835550 +0100 *************** *** 745,746 **** --- 745,748 ---- { /* Add new patch number below this line */ + /**/ + 1570, /**/ -- hundred-and-one symptoms of being an internet addict: 40. You tell the cab driver you live at http://123.elm.street/house/bluetrim.html 41. You actually try that 123.elm.street address. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///