jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone

Blame SOURCES/7.4.205

073263
To: vim_dev@googlegroups.com
073263
Subject: Patch 7.4.205
073263
Fcc: outbox
073263
From: Bram Moolenaar <Bram@moolenaar.net>
073263
Mime-Version: 1.0
073263
Content-Type: text/plain; charset=UTF-8
073263
Content-Transfer-Encoding: 8bit
073263
------------
073263
073263
Patch 7.4.205
073263
Problem:    ":mksession" writes command to move to second argument while it
073263
	    does not exist.  When it does exist the order might be wrong.
073263
Solution:   Use ":argadd" for each argument instead of using ":args" with a
073263
	    list of names. (Nobuhiro Takasaki)
073263
Files:	    src/ex_docmd.c
073263
073263
073263
*** ../vim-7.4.204/src/ex_docmd.c	2014-02-05 22:46:49.058587842 +0100
073263
--- src/ex_docmd.c	2014-03-12 21:08:35.361028825 +0100
073263
***************
073263
*** 10381,10387 ****
073263
      }
073263
  
073263
      /* the global argument list */
073263
!     if (ses_arglist(fd, "args", &global_alist.al_ga,
073263
  			    !(ssop_flags & SSOP_CURDIR), &ssop_flags) == FAIL)
073263
  	return FAIL;
073263
  
073263
--- 10381,10387 ----
073263
      }
073263
  
073263
      /* the global argument list */
073263
!     if (ses_arglist(fd, "argglobal", &global_alist.al_ga,
073263
  			    !(ssop_flags & SSOP_CURDIR), &ssop_flags) == FAIL)
073263
  	return FAIL;
073263
  
073263
***************
073263
*** 10955,10963 ****
073263
      char_u	*buf = NULL;
073263
      char_u	*s;
073263
  
073263
!     if (gap->ga_len == 0)
073263
! 	return put_line(fd, "silent! argdel *");
073263
!     if (fputs(cmd, fd) < 0)
073263
  	return FAIL;
073263
      for (i = 0; i < gap->ga_len; ++i)
073263
      {
073263
--- 10955,10963 ----
073263
      char_u	*buf = NULL;
073263
      char_u	*s;
073263
  
073263
!     if (fputs(cmd, fd) < 0 || put_eol(fd) == FAIL)
073263
! 	return FAIL;
073263
!     if (put_line(fd, "silent! argdel *") == FAIL)
073263
  	return FAIL;
073263
      for (i = 0; i < gap->ga_len; ++i)
073263
      {
073263
***************
073263
*** 10974,10980 ****
073263
  		    s = buf;
073263
  		}
073263
  	    }
073263
! 	    if (fputs(" ", fd) < 0 || ses_put_fname(fd, s, flagp) == FAIL)
073263
  	    {
073263
  		vim_free(buf);
073263
  		return FAIL;
073263
--- 10974,10982 ----
073263
  		    s = buf;
073263
  		}
073263
  	    }
073263
! 	    if (fputs("argadd ", fd) < 0
073263
! 		    || ses_put_fname(fd, s, flagp) == FAIL
073263
! 		    || put_eol(fd) == FAIL)
073263
  	    {
073263
  		vim_free(buf);
073263
  		return FAIL;
073263
***************
073263
*** 10982,10988 ****
073263
  	    vim_free(buf);
073263
  	}
073263
      }
073263
!     return put_eol(fd);
073263
  }
073263
  
073263
  /*
073263
--- 10984,10990 ----
073263
  	    vim_free(buf);
073263
  	}
073263
      }
073263
!     return OK;
073263
  }
073263
  
073263
  /*
073263
*** ../vim-7.4.204/src/version.c	2014-03-12 20:17:47.752982126 +0100
073263
--- src/version.c	2014-03-12 21:09:16.273029451 +0100
073263
***************
073263
*** 740,741 ****
073263
--- 740,743 ----
073263
  {   /* Add new patch number below this line */
073263
+ /**/
073263
+     205,
073263
  /**/
073263
073263
-- 
073263
A law to reduce crime states: "It is mandatory for a motorist with criminal
073263
intentions to stop at the city limits and telephone the chief of police as he
073263
is entering the town.
073263
		[real standing law in Washington, United States of America]
073263
073263
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
073263
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
073263
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
073263
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///