diff options
author | Florian Pritz <bluewind@xssn.at> | 2011-07-24 12:07:51 +0200 |
---|---|---|
committer | Florian Pritz <bluewind@xssn.at> | 2011-07-24 12:07:51 +0200 |
commit | b8c33ee22e78f48f52bfde7328d20efe73493149 (patch) | |
tree | af5a3a56a5094facb1c00472c0b1a3be7478eca2 /gvim/vim-7.2/7.2.325 | |
parent | 9c7f68c9ab1ed52a5c4c2cec57c71b15d2209f52 (diff) | |
parent | 34e8f8d7edc734b88753ff7cb0443f8489b02ee8 (diff) | |
download | aur-packages-b8c33ee22e78f48f52bfde7328d20efe73493149.tar.gz aur-packages-b8c33ee22e78f48f52bfde7328d20efe73493149.tar.xz |
Merge branch 'master' of git://git.server-speed.net/~flo/git/aur
Diffstat (limited to 'gvim/vim-7.2/7.2.325')
-rw-r--r-- | gvim/vim-7.2/7.2.325 | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/gvim/vim-7.2/7.2.325 b/gvim/vim-7.2/7.2.325 deleted file mode 100644 index 77a6e08..0000000 --- a/gvim/vim-7.2/7.2.325 +++ /dev/null @@ -1,52 +0,0 @@ -To: vim-dev@vim.org -Subject: Patch 7.2.325 -Fcc: outbox -From: Bram Moolenaar <Bram@moolenaar.net> -Mime-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.2.325 -Problem: A stray "w" in the startup vimrc file causes the edited file to be - replaced with an empty file. (Stone Kang). -Solution: Do not write a buffer when it has never been loaded. -Files: src/fileio.c - - -*** ../vim-7.2.324/src/fileio.c 2009-12-02 13:32:10.000000000 +0100 ---- src/fileio.c 2009-12-31 14:08:31.000000000 +0100 -*************** -*** 2981,2986 **** ---- 2981,2993 ---- - - if (fname == NULL || *fname == NUL) /* safety check */ - return FAIL; -+ if (buf->b_ml.ml_mfp == NULL) -+ { -+ /* This can happen during startup when there is a stray "w" in the -+ * vimrc file. */ -+ EMSG(_(e_emptybuf)); -+ return FAIL; -+ } - - /* - * Disallow writing from .exrc and .vimrc in current directory for -*** ../vim-7.2.324/src/version.c 2009-12-31 13:18:05.000000000 +0100 ---- src/version.c 2009-12-31 14:52:29.000000000 +0100 -*************** -*** 683,684 **** ---- 683,686 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 325, - /**/ - --- -hundred-and-one symptoms of being an internet addict: -74. Your most erotic dreams are about cybersex - - /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |