To: vim-dev@vim.org Subject: Patch 6.1.150 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1.150 Problem: OS/2, MS-Windows and MS-DOS: When 'shellslash' is set getcwd() still uses backslash. (Yegappan Lakshmanan) Solution: Adjust slashes in getcwd(). Files: src/eval.c *** ../vim61.149/src/eval.c Sun Jun 23 21:29:33 2002 --- src/eval.c Sun Aug 4 21:47:09 2002 *************** *** 10,16 **** /* * eval.c: Expression evaluation. */ ! #if defined(MSDOS) || defined(MSWIN32) || defined(WIN16) || defined(_WIN64) # include /* for mch_open(), must be before vim.h */ #endif --- 10,16 ---- /* * eval.c: Expression evaluation. */ ! #if defined(MSDOS) || defined(MSWIN) # include /* for mch_open(), must be before vim.h */ #endif *************** *** 3850,3856 **** --- 3850,3861 ---- if (mch_dirname(cwd, MAXPATHL) == FAIL) retvar->var_val.var_string = NULL; else + { retvar->var_val.var_string = vim_strsave(cwd); + #ifdef BACKSLASH_IN_FILENAME + slash_adjust(retvar->var_val.var_string); + #endif + } } /* *** ../vim61.149/src/version.c Sun Aug 4 21:38:36 2002 --- src/version.c Sun Aug 4 21:49:12 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 150, /**/ -- hundred-and-one symptoms of being an internet addict: 93. New mail alarm on your palmtop annoys other churchgoers. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ /// Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim \\\ \\\ Project leader for A-A-P -- http://www.a-a-p.org /// \\\ Lord Of The Rings helps Uganda - http://iccf-holland.org/lotr.html ///