|
 |
946f8e6 |
To: vim-dev@vim.org
|
|
|
946f8e6 |
Subject: Patch 7.2.325
|
|
|
946f8e6 |
Fcc: outbox
|
|
|
946f8e6 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
946f8e6 |
Mime-Version: 1.0
|
|
|
946f8e6 |
Content-Type: text/plain; charset=UTF-8
|
|
|
946f8e6 |
Content-Transfer-Encoding: 8bit
|
|
|
946f8e6 |
------------
|
|
|
946f8e6 |
|
|
|
946f8e6 |
Patch 7.2.325
|
|
|
946f8e6 |
Problem: A stray "w" in the startup vimrc file causes the edited file to be
|
|
|
946f8e6 |
replaced with an empty file. (Stone Kang).
|
|
|
946f8e6 |
Solution: Do not write a buffer when it has never been loaded.
|
|
|
946f8e6 |
Files: src/fileio.c
|
|
|
946f8e6 |
|
|
|
946f8e6 |
|
|
|
946f8e6 |
*** ../vim-7.2.324/src/fileio.c 2009-12-02 13:32:10.000000000 +0100
|
|
|
946f8e6 |
--- src/fileio.c 2009-12-31 14:08:31.000000000 +0100
|
|
|
946f8e6 |
***************
|
|
|
946f8e6 |
*** 2981,2986 ****
|
|
|
946f8e6 |
--- 2981,2993 ----
|
|
|
946f8e6 |
|
|
|
946f8e6 |
if (fname == NULL || *fname == NUL) /* safety check */
|
|
|
946f8e6 |
return FAIL;
|
|
|
946f8e6 |
+ if (buf->b_ml.ml_mfp == NULL)
|
|
|
946f8e6 |
+ {
|
|
|
946f8e6 |
+ /* This can happen during startup when there is a stray "w" in the
|
|
|
946f8e6 |
+ * vimrc file. */
|
|
|
946f8e6 |
+ EMSG(_(e_emptybuf));
|
|
|
946f8e6 |
+ return FAIL;
|
|
|
946f8e6 |
+ }
|
|
|
946f8e6 |
|
|
|
946f8e6 |
/*
|
|
|
946f8e6 |
* Disallow writing from .exrc and .vimrc in current directory for
|
|
|
946f8e6 |
*** ../vim-7.2.324/src/version.c 2009-12-31 13:18:05.000000000 +0100
|
|
|
946f8e6 |
--- src/version.c 2009-12-31 14:52:29.000000000 +0100
|
|
|
946f8e6 |
***************
|
|
|
946f8e6 |
*** 683,684 ****
|
|
|
946f8e6 |
--- 683,686 ----
|
|
|
946f8e6 |
{ /* Add new patch number below this line */
|
|
|
946f8e6 |
+ /**/
|
|
|
946f8e6 |
+ 325,
|
|
|
946f8e6 |
/**/
|
|
|
946f8e6 |
|
|
|
946f8e6 |
--
|
|
|
946f8e6 |
hundred-and-one symptoms of being an internet addict:
|
|
|
946f8e6 |
74. Your most erotic dreams are about cybersex
|
|
|
946f8e6 |
|
|
|
946f8e6 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
946f8e6 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
946f8e6 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
946f8e6 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|