|
 |
3ef2ca |
To: vim_dev@googlegroups.com
|
|
|
3ef2ca |
Subject: Patch 7.4.364
|
|
|
3ef2ca |
Fcc: outbox
|
|
|
3ef2ca |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
3ef2ca |
Mime-Version: 1.0
|
|
|
3ef2ca |
Content-Type: text/plain; charset=UTF-8
|
|
|
3ef2ca |
Content-Transfer-Encoding: 8bit
|
|
|
3ef2ca |
------------
|
|
|
3ef2ca |
|
|
|
3ef2ca |
Patch 7.4.364
|
|
|
3ef2ca |
Problem: When the viminfo file can't be renamed there is no error message.
|
|
|
3ef2ca |
(Vladimir Berezhnoy)
|
|
|
3ef2ca |
Solution: Check for the rename to fail.
|
|
|
3ef2ca |
Files: src/ex_cmds.c
|
|
|
3ef2ca |
|
|
|
3ef2ca |
|
|
|
3ef2ca |
*** ../vim-7.4.363/src/ex_cmds.c 2014-05-22 14:00:12.694534712 +0200
|
|
|
3ef2ca |
--- src/ex_cmds.c 2014-07-09 21:11:44.531557830 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 2004,2014 ****
|
|
|
3ef2ca |
{
|
|
|
3ef2ca |
fclose(fp_in);
|
|
|
3ef2ca |
|
|
|
3ef2ca |
! /*
|
|
|
3ef2ca |
! * In case of an error keep the original viminfo file.
|
|
|
3ef2ca |
! * Otherwise rename the newly written file.
|
|
|
3ef2ca |
! */
|
|
|
3ef2ca |
! if (viminfo_errcnt || vim_rename(tempname, fname) == -1)
|
|
|
3ef2ca |
mch_remove(tempname);
|
|
|
3ef2ca |
|
|
|
3ef2ca |
#ifdef WIN3264
|
|
|
3ef2ca |
--- 2004,2017 ----
|
|
|
3ef2ca |
{
|
|
|
3ef2ca |
fclose(fp_in);
|
|
|
3ef2ca |
|
|
|
3ef2ca |
! /* In case of an error keep the original viminfo file. Otherwise
|
|
|
3ef2ca |
! * rename the newly written file. Give an error if that fails. */
|
|
|
3ef2ca |
! if (viminfo_errcnt == 0 && vim_rename(tempname, fname) == -1)
|
|
|
3ef2ca |
! {
|
|
|
3ef2ca |
! ++viminfo_errcnt;
|
|
|
3ef2ca |
! EMSG2(_("E886: Can't rename viminfo file to %s!"), fname);
|
|
|
3ef2ca |
! }
|
|
|
3ef2ca |
! if (viminfo_errcnt > 0)
|
|
|
3ef2ca |
mch_remove(tempname);
|
|
|
3ef2ca |
|
|
|
3ef2ca |
#ifdef WIN3264
|
|
|
3ef2ca |
*** ../vim-7.4.363/src/version.c 2014-07-09 20:51:04.519583033 +0200
|
|
|
3ef2ca |
--- src/version.c 2014-07-09 21:13:18.575555919 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 736,737 ****
|
|
|
3ef2ca |
--- 736,739 ----
|
|
|
3ef2ca |
{ /* Add new patch number below this line */
|
|
|
3ef2ca |
+ /**/
|
|
|
3ef2ca |
+ 364,
|
|
|
3ef2ca |
/**/
|
|
|
3ef2ca |
|
|
|
3ef2ca |
--
|
|
|
3ef2ca |
MONK: ... and the Lord spake, saying, "First shalt thou take out the Holy Pin,
|
|
|
3ef2ca |
then shalt thou count to three, no more, no less. Three shalt be the
|
|
|
3ef2ca |
number thou shalt count, and the number of the counting shalt be three.
|
|
|
3ef2ca |
Four shalt thou not count, neither count thou two, excepting that thou
|
|
|
3ef2ca |
then proceed to three. Five is right out. Once the number three, being
|
|
|
3ef2ca |
the third number, be reached, then lobbest thou thy Holy Hand Grenade of
|
|
|
3ef2ca |
Antioch towards thou foe, who being naughty in my sight, shall snuff it.
|
|
|
3ef2ca |
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
|
|
3ef2ca |
|
|
|
3ef2ca |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
3ef2ca |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
3ef2ca |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
3ef2ca |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|