To: vim_dev@googlegroups.com Subject: Patch 8.2.2839 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2839 Problem: Default redirection missing "ash" and "dash". Solution: Recognize "ash" and "dash". (Natanael Copa, closes #8180) Files: runtime/doc/options.txt, src/option.c *** ../vim-8.2.2838/runtime/doc/options.txt 2021-04-17 21:04:22.050657386 +0200 --- runtime/doc/options.txt 2021-05-06 18:36:28.974259267 +0200 *************** *** 6601,6609 **** in a file and echoed to the screen. If the 'shell' option is "csh" or "tcsh" after initializations, the default becomes "|& tee". If the 'shell' option is "sh", "ksh", "mksh", "pdksh", "zsh", "zsh-beta", ! "bash" or "fish" the default becomes "2>&1| tee". This means that ! stderr is also included. Before using the 'shell' option a path is ! removed, thus "/bin/sh" uses "sh". The initialization of this option is done after reading the ".vimrc" and the other initializations, so that when the 'shell' option is set there, the 'shellpipe' option changes automatically, unless it was --- 6606,6614 ---- in a file and echoed to the screen. If the 'shell' option is "csh" or "tcsh" after initializations, the default becomes "|& tee". If the 'shell' option is "sh", "ksh", "mksh", "pdksh", "zsh", "zsh-beta", ! "bash", "fish", "ash" or "dash" the default becomes "2>&1| tee". This ! means that stderr is also included. Before using the 'shell' option a ! path is removed, thus "/bin/sh" uses "sh". The initialization of this option is done after reading the ".vimrc" and the other initializations, so that when the 'shell' option is set there, the 'shellpipe' option changes automatically, unless it was *** ../vim-8.2.2838/src/option.c 2021-04-17 21:04:22.054657370 +0200 --- src/option.c 2021-05-06 18:36:28.978259238 +0200 *************** *** 910,916 **** } } else ! // Always use bourne shell style redirection if we reach this if ( fnamecmp(p, "sh") == 0 || fnamecmp(p, "ksh") == 0 || fnamecmp(p, "mksh") == 0 --- 910,916 ---- } } else ! // Always use POSIX shell style redirection if we reach this if ( fnamecmp(p, "sh") == 0 || fnamecmp(p, "ksh") == 0 || fnamecmp(p, "mksh") == 0 *************** *** 919,924 **** --- 919,926 ---- || fnamecmp(p, "zsh-beta") == 0 || fnamecmp(p, "bash") == 0 || fnamecmp(p, "fish") == 0 + || fnamecmp(p, "ash") == 0 + || fnamecmp(p, "dash") == 0 # ifdef MSWIN || fnamecmp(p, "cmd") == 0 || fnamecmp(p, "sh.exe") == 0 *************** *** 929,934 **** --- 931,937 ---- || fnamecmp(p, "zsh-beta.exe") == 0 || fnamecmp(p, "bash.exe") == 0 || fnamecmp(p, "cmd.exe") == 0 + || fnamecmp(p, "dash.exe") == 0 # endif ) { *** ../vim-8.2.2838/src/version.c 2021-05-06 17:45:18.550897742 +0200 --- src/version.c 2021-05-06 18:38:21.829551432 +0200 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2839, /**/ -- hundred-and-one symptoms of being an internet addict: 239. You think "surfing" is something you do on dry land. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///