To: vim-dev@vim.org Subject: Patch 6.2f.004 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.2f.004 Problem: "vim --version" always uses CR/LF in the output. Solution: Omit the CR. Files: src/message.c, src/os_unix.c *** ../vim-6.2f.003/src/message.c Mon May 26 22:15:06 2003 --- src/message.c Mon May 26 20:56:11 2003 *************** *** 1682,1690 **** if (!silent_mode) { p = &buf[0]; ! /* NL --> CR NL translation (for Unix) */ /* NL --> CR translation (for Mac) */ ! if (*s == '\n') *p++ = '\r'; #if defined(USE_CR) && !defined(MACOS_X_UNIX) else --- 1682,1690 ---- if (!silent_mode) { p = &buf[0]; ! /* NL --> CR NL translation (for Unix, not for "--version") */ /* NL --> CR translation (for Mac) */ ! if (*s == '\n' && !info_message) *p++ = '\r'; #if defined(USE_CR) && !defined(MACOS_X_UNIX) else *** ../vim-6.2f.003/src/os_unix.c Mon May 26 22:15:06 2003 --- src/os_unix.c Mon May 26 20:57:14 2003 *************** *** 2547,2553 **** if (msg_use_printf()) { if (info_message) ! mch_msg("\r\n"); else mch_errmsg("\r\n"); } --- 2547,2553 ---- if (msg_use_printf()) { if (info_message) ! mch_msg("\n"); else mch_errmsg("\r\n"); } *** ../vim-6.2f.003/src/version.c Mon May 26 22:56:02 2003 --- src/version.c Mon May 26 22:57:43 2003 *************** *** 632,633 **** --- 632,635 ---- { /* Add new patch number below this line */ + /**/ + 4, /**/ -- It is too bad that the speed of light hasn't kept pace with the changes in CPU speed and network bandwidth. -- /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ \\\ Project leader for A-A-P -- http://www.A-A-P.org /// \\\ Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///