[packages/vim.git] / 7.0.041

To: vim-dev@vim.org
Subject: Patch 7.0.041
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.041
Problem:    cursor([1, 1]) doesn't work. (Peter Hodge)
Solution:   Allow leaving out the third item of the list and use zero for the
	    virtual column offset.
Files:	    src/eval.c


*** ../vim-7.0.040/src/eval.c	Sun Jul 23 21:52:16 2006
--- src/eval.c	Mon Jul 10 23:03:13 2006
***************
*** 16465,16473 ****
      long	i = 0;
      long	n;
  
!     /* List must be: [fnum, lnum, col, coladd] */
!     if (arg->v_type != VAR_LIST || l == NULL
! 				      || l->lv_len != (fnump == NULL ? 3 : 4))
  	return FAIL;
  
      if (fnump != NULL)
--- 16465,16476 ----
      long	i = 0;
      long	n;
  
!     /* List must be: [fnum, lnum, col, coladd], where "fnum" is only there
!      * when "fnump" isn't NULL and "coladd" is optional. */
!     if (arg->v_type != VAR_LIST
! 	    || l == NULL
! 	    || l->lv_len < (fnump == NULL ? 2 : 3)
! 	    || l->lv_len > (fnump == NULL ? 3 : 4))
  	return FAIL;
  
      if (fnump != NULL)
***************
*** 16493,16500 ****
  #ifdef FEAT_VIRTUALEDIT
      n = list_find_nr(l, i, NULL);
      if (n < 0)
! 	return FAIL;
!     posp->coladd = n;
  #endif
  
      return OK;
--- 16496,16504 ----
  #ifdef FEAT_VIRTUALEDIT
      n = list_find_nr(l, i, NULL);
      if (n < 0)
! 	posp->coladd = 0;
!     else
! 	posp->coladd = n;
  #endif
  
      return OK;
*** ../vim-7.0.040/src/version.c	Sun Jul 23 21:52:16 2006
--- src/version.c	Sun Jul 23 21:59:43 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     41,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
43. You tell the kids they can't use the computer because "Daddy's got work to
    do" and you don't even have a job.

 /// 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    ///
Commit	Line	Data
7a7a4b06	1	To: vim-dev@vim.org
	2	Subject: Patch 7.0.041
	3	Fcc: outbox
	4	From: Bram Moolenaar <Bram@moolenaar.net>
	5	Mime-Version: 1.0
	6	Content-Type: text/plain; charset=ISO-8859-1
	7	Content-Transfer-Encoding: 8bit
	8	------------
	9
	10	Patch 7.0.041
	11	Problem: cursor([1, 1]) doesn't work. (Peter Hodge)
	12	Solution: Allow leaving out the third item of the list and use zero for the
	13	virtual column offset.
	14	Files: src/eval.c
	15
	16
	17	*** ../vim-7.0.040/src/eval.c Sun Jul 23 21:52:16 2006
	18	--- src/eval.c Mon Jul 10 23:03:13 2006
	19	***************
	20	* 16465,16473 **
	21	long i = 0;
	22	long n;
	23
	24	! /* List must be: [fnum, lnum, col, coladd] */
	25	! if (arg->v_type != VAR_LIST \|\| l == NULL
	26	! \|\| l->lv_len != (fnump == NULL ? 3 : 4))
	27	return FAIL;
	28
	29	if (fnump != NULL)
	30	--- 16465,16476 ----
	31	long i = 0;
	32	long n;
	33
	34	! /* List must be: [fnum, lnum, col, coladd], where "fnum" is only there
	35	! * when "fnump" isn't NULL and "coladd" is optional. */
	36	! if (arg->v_type != VAR_LIST
	37	! \|\| l == NULL
	38	! \|\| l->lv_len < (fnump == NULL ? 2 : 3)
	39	! \|\| l->lv_len > (fnump == NULL ? 3 : 4))
	40	return FAIL;
	41
	42	if (fnump != NULL)
	43	***************
	44	* 16493,16500 **
	45	#ifdef FEAT_VIRTUALEDIT
	46	n = list_find_nr(l, i, NULL);
	47	if (n < 0)
	48	! return FAIL;
	49	! posp->coladd = n;
	50	#endif
	51
	52	return OK;
	53	--- 16496,16504 ----
	54	#ifdef FEAT_VIRTUALEDIT
	55	n = list_find_nr(l, i, NULL);
	56	if (n < 0)
	57	! posp->coladd = 0;
	58	! else
	59	! posp->coladd = n;
	60	#endif
	61
	62	return OK;
	63	*** ../vim-7.0.040/src/version.c Sun Jul 23 21:52:16 2006
	64	--- src/version.c Sun Jul 23 21:59:43 2006
65	***************
66	* 668,669 **
67	--- 668,671 ----
68	{ /* Add new patch number below this line */
69	+ /**/
70	+ 41,
71	/**/
72
73	--
74	hundred-and-one symptoms of being an internet addict:
75	43. You tell the kids they can't use the computer because "Daddy's got work to
76	do" and you don't even have a job.
77
78	/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
79	/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
80	\\\ download, build and distribute -- http://www.A-A-P.org ///
81	\\\ help me help AIDS victims -- http://ICCF-Holland.org ///