aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

updated for version 7.1-020

Browse Source
This commit is contained in:
Bram Moolenaar
2007-07-05 08:11:42 +00:00
parent 3ebc1e5112
commit 6a51606966
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/message.c
View File

@@ -3456,11 +3456,11 @@ msg_show_console_dialog(message, buttons, dfltbutton)
/* advance to next hotkey and set default hotkey */ /* advance to next hotkey and set default hotkey */
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
if (has_mbyte) if (has_mbyte)
hotkp += (*mb_ptr2len)(hotkp); hotkp += STRLEN(hotkp);
else else
#endif #endif
++hotkp; ++hotkp;
(void)copy_char(r + 1, hotkp, TRUE); hotkp[copy_char(r + 1, hotkp, TRUE)] = NUL;
if (dfltbutton) if (dfltbutton)
--dfltbutton; --dfltbutton;
@@ -3493,7 +3493,7 @@ msg_show_console_dialog(message, buttons, dfltbutton)
*msgp++ = (dfltbutton == 1) ? ']' : ')'; *msgp++ = (dfltbutton == 1) ? ']' : ')';
/* redefine hotkey */ /* redefine hotkey */
(void)copy_char(r, hotkp, TRUE); hotkp[copy_char(r, hotkp, TRUE)] = NUL;
} }
} }
else else
@@ -3519,8 +3519,6 @@ msg_show_console_dialog(message, buttons, dfltbutton)
*msgp++ = ':'; *msgp++ = ':';
*msgp++ = ' '; *msgp++ = ' ';
*msgp = NUL; *msgp = NUL;
mb_ptr_adv(hotkp);
*hotkp = NUL;
} }
else else
{ {
@@ -3555,8 +3553,9 @@ msg_show_console_dialog(message, buttons, dfltbutton)
msgp = confirm_msg + 1 + STRLEN(message); msgp = confirm_msg + 1 + STRLEN(message);
hotkp = hotk; hotkp = hotk;
/* define first default hotkey */ /* Define first default hotkey. Keep the hotkey string NUL
(void)copy_char(buttons, hotkp, TRUE); * terminated to avoid reading past the end. */
hotkp[copy_char(buttons, hotkp, TRUE)] = NUL;
/* Remember where the choices start, displaying starts here when /* Remember where the choices start, displaying starts here when
* "hotkp" typed at the more prompt. */ * "hotkp" typed at the more prompt. */

2
src/version.c
View File

@@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
20,
/**/ /**/
19, 19,
/**/ /**/