|
 |
15f66ea |
To: vim-dev@vim.org
|
|
|
15f66ea |
Subject: Patch 7.3.024
|
|
|
15f66ea |
Fcc: outbox
|
|
|
15f66ea |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
15f66ea |
Mime-Version: 1.0
|
|
|
15f66ea |
Content-Type: text/plain; charset=UTF-8
|
|
|
15f66ea |
Content-Transfer-Encoding: 8bit
|
|
|
15f66ea |
------------
|
|
|
15f66ea |
|
|
|
15f66ea |
Patch 7.3.024
|
|
|
15f66ea |
Problem: Named signs do not use a negative number as intended.
|
|
|
15f66ea |
Solution: Fix the numbering of named signs. (Xavier de Gaye)
|
|
|
15f66ea |
Files: src/ex_cmds.c
|
|
|
15f66ea |
|
|
|
15f66ea |
|
|
|
15f66ea |
*** ../vim-7.3.023/src/ex_cmds.c 2010-09-21 16:56:29.000000000 +0200
|
|
|
15f66ea |
--- src/ex_cmds.c 2010-10-13 16:37:18.000000000 +0200
|
|
|
15f66ea |
***************
|
|
|
15f66ea |
*** 6670,6680 ****
|
|
|
15f66ea |
sp = (sign_T *)alloc_clear((unsigned)sizeof(sign_T));
|
|
|
15f66ea |
if (sp == NULL)
|
|
|
15f66ea |
return;
|
|
|
15f66ea |
- if (sp_prev == NULL)
|
|
|
15f66ea |
- first_sign = sp;
|
|
|
15f66ea |
- else
|
|
|
15f66ea |
- sp_prev->sn_next = sp;
|
|
|
15f66ea |
- sp->sn_name = vim_strnsave(arg, (int)(p - arg));
|
|
|
15f66ea |
|
|
|
15f66ea |
/* If the name is a number use that for the typenr,
|
|
|
15f66ea |
* otherwise use a negative number. */
|
|
|
15f66ea |
--- 6670,6675 ----
|
|
|
15f66ea |
***************
|
|
|
15f66ea |
*** 6687,6699 ****
|
|
|
15f66ea |
|
|
|
15f66ea |
for (lp = first_sign; lp != NULL; lp = lp->sn_next)
|
|
|
15f66ea |
{
|
|
|
15f66ea |
! if (lp->sn_typenr == last_sign_typenr)
|
|
|
15f66ea |
{
|
|
|
15f66ea |
--last_sign_typenr;
|
|
|
15f66ea |
if (last_sign_typenr == 0)
|
|
|
15f66ea |
last_sign_typenr = MAX_TYPENR;
|
|
|
15f66ea |
if (last_sign_typenr == start)
|
|
|
15f66ea |
{
|
|
|
15f66ea |
EMSG(_("E612: Too many signs defined"));
|
|
|
15f66ea |
return;
|
|
|
15f66ea |
}
|
|
|
15f66ea |
--- 6682,6695 ----
|
|
|
15f66ea |
|
|
|
15f66ea |
for (lp = first_sign; lp != NULL; lp = lp->sn_next)
|
|
|
15f66ea |
{
|
|
|
15f66ea |
! if (lp->sn_typenr == -last_sign_typenr)
|
|
|
15f66ea |
{
|
|
|
15f66ea |
--last_sign_typenr;
|
|
|
15f66ea |
if (last_sign_typenr == 0)
|
|
|
15f66ea |
last_sign_typenr = MAX_TYPENR;
|
|
|
15f66ea |
if (last_sign_typenr == start)
|
|
|
15f66ea |
{
|
|
|
15f66ea |
+ vim_free(sp);
|
|
|
15f66ea |
EMSG(_("E612: Too many signs defined"));
|
|
|
15f66ea |
return;
|
|
|
15f66ea |
}
|
|
|
15f66ea |
***************
|
|
|
15f66ea |
*** 6702,6711 ****
|
|
|
15f66ea |
}
|
|
|
15f66ea |
}
|
|
|
15f66ea |
|
|
|
15f66ea |
! sp->sn_typenr = last_sign_typenr--;
|
|
|
15f66ea |
! if (last_sign_typenr == 0)
|
|
|
15f66ea |
last_sign_typenr = MAX_TYPENR; /* wrap around */
|
|
|
15f66ea |
}
|
|
|
15f66ea |
}
|
|
|
15f66ea |
|
|
|
15f66ea |
/* set values for a defined sign. */
|
|
|
15f66ea |
--- 6698,6714 ----
|
|
|
15f66ea |
}
|
|
|
15f66ea |
}
|
|
|
15f66ea |
|
|
|
15f66ea |
! sp->sn_typenr = -last_sign_typenr;
|
|
|
15f66ea |
! if (--last_sign_typenr == 0)
|
|
|
15f66ea |
last_sign_typenr = MAX_TYPENR; /* wrap around */
|
|
|
15f66ea |
}
|
|
|
15f66ea |
+
|
|
|
15f66ea |
+ /* add the new sign to the list of signs */
|
|
|
15f66ea |
+ if (sp_prev == NULL)
|
|
|
15f66ea |
+ first_sign = sp;
|
|
|
15f66ea |
+ else
|
|
|
15f66ea |
+ sp_prev->sn_next = sp;
|
|
|
15f66ea |
+ sp->sn_name = vim_strnsave(arg, (int)(p - arg));
|
|
|
15f66ea |
}
|
|
|
15f66ea |
|
|
|
15f66ea |
/* set values for a defined sign. */
|
|
|
15f66ea |
*** ../vim-7.3.023/src/version.c 2010-10-13 16:22:05.000000000 +0200
|
|
|
15f66ea |
--- src/version.c 2010-10-13 16:42:14.000000000 +0200
|
|
|
15f66ea |
***************
|
|
|
15f66ea |
*** 716,717 ****
|
|
|
15f66ea |
--- 716,719 ----
|
|
|
15f66ea |
{ /* Add new patch number below this line */
|
|
|
15f66ea |
+ /**/
|
|
|
15f66ea |
+ 24,
|
|
|
15f66ea |
/**/
|
|
|
15f66ea |
|
|
|
15f66ea |
--
|
|
|
15f66ea |
In war we're tough and able.
|
|
|
15f66ea |
Quite indefatigable
|
|
|
15f66ea |
Between our quests
|
|
|
15f66ea |
We sequin vests
|
|
|
15f66ea |
And impersonate Clark Gable
|
|
|
15f66ea |
It's a busy life in Camelot.
|
|
|
15f66ea |
I have to push the pram a lot.
|
|
|
15f66ea |
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
|
|
15f66ea |
|
|
|
15f66ea |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
15f66ea |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
15f66ea |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
15f66ea |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|