|
 |
d6ba96 |
To: vim_dev@googlegroups.com
|
|
|
d6ba96 |
Subject: Patch 7.4.546
|
|
|
d6ba96 |
Fcc: outbox
|
|
|
d6ba96 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
d6ba96 |
Mime-Version: 1.0
|
|
|
d6ba96 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d6ba96 |
Content-Transfer-Encoding: 8bit
|
|
|
d6ba96 |
------------
|
|
|
d6ba96 |
|
|
|
d6ba96 |
Patch 7.4.546
|
|
|
d6ba96 |
Problem: Repeated use of vim_snprintf() with a number.
|
|
|
d6ba96 |
Solution: Move these vim_snprintf() calls into a function.
|
|
|
d6ba96 |
Files: src/window.c
|
|
|
d6ba96 |
|
|
|
d6ba96 |
|
|
|
d6ba96 |
*** ../vim-7.4.545/src/window.c 2014-11-27 16:22:42.746412995 +0100
|
|
|
d6ba96 |
--- src/window.c 2014-12-13 03:54:57.760646343 +0100
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 11,16 ****
|
|
|
d6ba96 |
--- 11,17 ----
|
|
|
d6ba96 |
|
|
|
d6ba96 |
static int path_is_url __ARGS((char_u *p));
|
|
|
d6ba96 |
#if defined(FEAT_WINDOWS) || defined(PROTO)
|
|
|
d6ba96 |
+ static void cmd_with_count __ARGS((char *cmd, char_u *bufp, size_t bufsize, long Prenum));
|
|
|
d6ba96 |
static void win_init __ARGS((win_T *newp, win_T *oldp, int flags));
|
|
|
d6ba96 |
static void win_init_some __ARGS((win_T *newp, win_T *oldp));
|
|
|
d6ba96 |
static void frame_comp_pos __ARGS((frame_T *topfrp, int *row, int *col));
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 167,176 ****
|
|
|
d6ba96 |
case '^':
|
|
|
d6ba96 |
CHECK_CMDWIN
|
|
|
d6ba96 |
reset_VIsual_and_resel(); /* stop Visual mode */
|
|
|
d6ba96 |
! STRCPY(cbuf, "split #");
|
|
|
d6ba96 |
! if (Prenum)
|
|
|
d6ba96 |
! vim_snprintf((char *)cbuf + 7, sizeof(cbuf) - 7,
|
|
|
d6ba96 |
! "%ld", Prenum);
|
|
|
d6ba96 |
do_cmdline_cmd(cbuf);
|
|
|
d6ba96 |
break;
|
|
|
d6ba96 |
|
|
|
d6ba96 |
--- 168,174 ----
|
|
|
d6ba96 |
case '^':
|
|
|
d6ba96 |
CHECK_CMDWIN
|
|
|
d6ba96 |
reset_VIsual_and_resel(); /* stop Visual mode */
|
|
|
d6ba96 |
! cmd_with_count("split #", cbuf, sizeof(cbuf), Prenum);
|
|
|
d6ba96 |
do_cmdline_cmd(cbuf);
|
|
|
d6ba96 |
break;
|
|
|
d6ba96 |
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 199,208 ****
|
|
|
d6ba96 |
case Ctrl_Q:
|
|
|
d6ba96 |
case 'q':
|
|
|
d6ba96 |
reset_VIsual_and_resel(); /* stop Visual mode */
|
|
|
d6ba96 |
! STRCPY(cbuf, "quit");
|
|
|
d6ba96 |
! if (Prenum)
|
|
|
d6ba96 |
! vim_snprintf((char *)cbuf + 4, sizeof(cbuf) - 5,
|
|
|
d6ba96 |
! "%ld", Prenum);
|
|
|
d6ba96 |
do_cmdline_cmd(cbuf);
|
|
|
d6ba96 |
break;
|
|
|
d6ba96 |
|
|
|
d6ba96 |
--- 197,203 ----
|
|
|
d6ba96 |
case Ctrl_Q:
|
|
|
d6ba96 |
case 'q':
|
|
|
d6ba96 |
reset_VIsual_and_resel(); /* stop Visual mode */
|
|
|
d6ba96 |
! cmd_with_count("quit", cbuf, sizeof(cbuf), Prenum);
|
|
|
d6ba96 |
do_cmdline_cmd(cbuf);
|
|
|
d6ba96 |
break;
|
|
|
d6ba96 |
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 210,219 ****
|
|
|
d6ba96 |
case Ctrl_C:
|
|
|
d6ba96 |
case 'c':
|
|
|
d6ba96 |
reset_VIsual_and_resel(); /* stop Visual mode */
|
|
|
d6ba96 |
! STRCPY(cbuf, "close");
|
|
|
d6ba96 |
! if (Prenum)
|
|
|
d6ba96 |
! vim_snprintf((char *)cbuf + 5, sizeof(cbuf) - 5,
|
|
|
d6ba96 |
! "%ld", Prenum);
|
|
|
d6ba96 |
do_cmdline_cmd(cbuf);
|
|
|
d6ba96 |
break;
|
|
|
d6ba96 |
|
|
|
d6ba96 |
--- 205,211 ----
|
|
|
d6ba96 |
case Ctrl_C:
|
|
|
d6ba96 |
case 'c':
|
|
|
d6ba96 |
reset_VIsual_and_resel(); /* stop Visual mode */
|
|
|
d6ba96 |
! cmd_with_count("close", cbuf, sizeof(cbuf), Prenum);
|
|
|
d6ba96 |
do_cmdline_cmd(cbuf);
|
|
|
d6ba96 |
break;
|
|
|
d6ba96 |
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 243,252 ****
|
|
|
d6ba96 |
case 'o':
|
|
|
d6ba96 |
CHECK_CMDWIN
|
|
|
d6ba96 |
reset_VIsual_and_resel(); /* stop Visual mode */
|
|
|
d6ba96 |
! STRCPY(cbuf, "only");
|
|
|
d6ba96 |
! if (Prenum > 0)
|
|
|
d6ba96 |
! vim_snprintf((char *)cbuf + 4, sizeof(cbuf) - 4,
|
|
|
d6ba96 |
! "%ld", Prenum);
|
|
|
d6ba96 |
do_cmdline_cmd(cbuf);
|
|
|
d6ba96 |
break;
|
|
|
d6ba96 |
|
|
|
d6ba96 |
--- 235,241 ----
|
|
|
d6ba96 |
case 'o':
|
|
|
d6ba96 |
CHECK_CMDWIN
|
|
|
d6ba96 |
reset_VIsual_and_resel(); /* stop Visual mode */
|
|
|
d6ba96 |
! cmd_with_count("only", cbuf, sizeof(cbuf), Prenum);
|
|
|
d6ba96 |
do_cmdline_cmd(cbuf);
|
|
|
d6ba96 |
break;
|
|
|
d6ba96 |
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 635,640 ****
|
|
|
d6ba96 |
--- 624,643 ----
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
|
|
|
d6ba96 |
+ static void
|
|
|
d6ba96 |
+ cmd_with_count(cmd, bufp, bufsize, Prenum)
|
|
|
d6ba96 |
+ char *cmd;
|
|
|
d6ba96 |
+ char_u *bufp;
|
|
|
d6ba96 |
+ size_t bufsize;
|
|
|
d6ba96 |
+ long Prenum;
|
|
|
d6ba96 |
+ {
|
|
|
d6ba96 |
+ size_t len = STRLEN(cmd);
|
|
|
d6ba96 |
+
|
|
|
d6ba96 |
+ STRCPY(bufp, cmd);
|
|
|
d6ba96 |
+ if (Prenum > 0)
|
|
|
d6ba96 |
+ vim_snprintf((char *)bufp + len, bufsize - len, "%ld", Prenum);
|
|
|
d6ba96 |
+ }
|
|
|
d6ba96 |
+
|
|
|
d6ba96 |
/*
|
|
|
d6ba96 |
* split the current window, implements CTRL-W s and :split
|
|
|
d6ba96 |
*
|
|
|
d6ba96 |
*** ../vim-7.4.545/src/version.c 2014-12-13 03:36:34.992435104 +0100
|
|
|
d6ba96 |
--- src/version.c 2014-12-13 03:43:58.447663037 +0100
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 743,744 ****
|
|
|
d6ba96 |
--- 743,746 ----
|
|
|
d6ba96 |
{ /* Add new patch number below this line */
|
|
|
d6ba96 |
+ /**/
|
|
|
d6ba96 |
+ 546,
|
|
|
d6ba96 |
/**/
|
|
|
d6ba96 |
|
|
|
d6ba96 |
--
|
|
|
d6ba96 |
The only way the average employee can speak to an executive is by taking a
|
|
|
d6ba96 |
second job as a golf caddie.
|
|
|
d6ba96 |
(Scott Adams - The Dilbert principle)
|
|
|
d6ba96 |
|
|
|
d6ba96 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
d6ba96 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
d6ba96 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
d6ba96 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|