|
 |
55fd8be |
To: vim-dev@vim.org
|
|
|
55fd8be |
Subject: Patch 7.2.073
|
|
|
55fd8be |
Fcc: outbox
|
|
|
55fd8be |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
55fd8be |
Mime-Version: 1.0
|
|
|
55fd8be |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
55fd8be |
Content-Transfer-Encoding: 8bit
|
|
|
55fd8be |
------------
|
|
|
55fd8be |
|
|
|
55fd8be |
Patch 7.2.073
|
|
|
55fd8be |
Problem: ":set <xHome>" has the same output as ":set <Home>". (Matt
|
|
|
55fd8be |
Wozniski)
|
|
|
55fd8be |
Solution: Don't translate "x" keys to its alternative for ":set".
|
|
|
55fd8be |
Files: src/misc2.c, src/option.c, src/proto/misc2.pro
|
|
|
55fd8be |
|
|
|
55fd8be |
|
|
|
55fd8be |
*** ../vim-7.2.072/src/misc2.c Wed Nov 12 13:07:48 2008
|
|
|
55fd8be |
--- src/misc2.c Sun Dec 14 12:28:47 2008
|
|
|
55fd8be |
***************
|
|
|
55fd8be |
*** 2561,2567 ****
|
|
|
55fd8be |
int key;
|
|
|
55fd8be |
int dlen = 0;
|
|
|
55fd8be |
|
|
|
55fd8be |
! key = find_special_key(srcp, &modifiers, keycode);
|
|
|
55fd8be |
if (key == 0)
|
|
|
55fd8be |
return 0;
|
|
|
55fd8be |
|
|
|
55fd8be |
--- 2561,2567 ----
|
|
|
55fd8be |
int key;
|
|
|
55fd8be |
int dlen = 0;
|
|
|
55fd8be |
|
|
|
55fd8be |
! key = find_special_key(srcp, &modifiers, keycode, FALSE);
|
|
|
55fd8be |
if (key == 0)
|
|
|
55fd8be |
return 0;
|
|
|
55fd8be |
|
|
|
55fd8be |
***************
|
|
|
55fd8be |
*** 2597,2606 ****
|
|
|
55fd8be |
* returns 0 if there is no match.
|
|
|
55fd8be |
*/
|
|
|
55fd8be |
int
|
|
|
55fd8be |
! find_special_key(srcp, modp, keycode)
|
|
|
55fd8be |
char_u **srcp;
|
|
|
55fd8be |
int *modp;
|
|
|
55fd8be |
! int keycode; /* prefer key code, e.g. K_DEL instead of DEL */
|
|
|
55fd8be |
{
|
|
|
55fd8be |
char_u *last_dash;
|
|
|
55fd8be |
char_u *end_of_name;
|
|
|
55fd8be |
--- 2597,2607 ----
|
|
|
55fd8be |
* returns 0 if there is no match.
|
|
|
55fd8be |
*/
|
|
|
55fd8be |
int
|
|
|
55fd8be |
! find_special_key(srcp, modp, keycode, keep_x_key)
|
|
|
55fd8be |
char_u **srcp;
|
|
|
55fd8be |
int *modp;
|
|
|
55fd8be |
! int keycode; /* prefer key code, e.g. K_DEL instead of DEL */
|
|
|
55fd8be |
! int keep_x_key; /* don't translate xHome to Home key */
|
|
|
55fd8be |
{
|
|
|
55fd8be |
char_u *last_dash;
|
|
|
55fd8be |
char_u *end_of_name;
|
|
|
55fd8be |
***************
|
|
|
55fd8be |
*** 2668,2674 ****
|
|
|
55fd8be |
else
|
|
|
55fd8be |
{
|
|
|
55fd8be |
key = get_special_key_code(last_dash + 1);
|
|
|
55fd8be |
! key = handle_x_keys(key);
|
|
|
55fd8be |
}
|
|
|
55fd8be |
|
|
|
55fd8be |
/*
|
|
|
55fd8be |
--- 2669,2676 ----
|
|
|
55fd8be |
else
|
|
|
55fd8be |
{
|
|
|
55fd8be |
key = get_special_key_code(last_dash + 1);
|
|
|
55fd8be |
! if (!keep_x_key)
|
|
|
55fd8be |
! key = handle_x_keys(key);
|
|
|
55fd8be |
}
|
|
|
55fd8be |
|
|
|
55fd8be |
/*
|
|
|
55fd8be |
*** ../vim-7.2.072/src/option.c Fri Nov 28 21:26:50 2008
|
|
|
55fd8be |
--- src/option.c Sun Dec 14 12:28:56 2008
|
|
|
55fd8be |
***************
|
|
|
55fd8be |
*** 8328,8334 ****
|
|
|
55fd8be |
{
|
|
|
55fd8be |
--arg; /* put arg at the '<' */
|
|
|
55fd8be |
modifiers = 0;
|
|
|
55fd8be |
! key = find_special_key(&arg, &modifiers, TRUE);
|
|
|
55fd8be |
if (modifiers) /* can't handle modifiers here */
|
|
|
55fd8be |
key = 0;
|
|
|
55fd8be |
}
|
|
|
55fd8be |
--- 8328,8334 ----
|
|
|
55fd8be |
{
|
|
|
55fd8be |
--arg; /* put arg at the '<' */
|
|
|
55fd8be |
modifiers = 0;
|
|
|
55fd8be |
! key = find_special_key(&arg, &modifiers, TRUE, TRUE);
|
|
|
55fd8be |
if (modifiers) /* can't handle modifiers here */
|
|
|
55fd8be |
key = 0;
|
|
|
55fd8be |
}
|
|
|
55fd8be |
*** ../vim-7.2.072/src/proto/misc2.pro Thu Jul 24 20:29:37 2008
|
|
|
55fd8be |
--- src/proto/misc2.pro Sun Dec 14 12:29:05 2008
|
|
|
55fd8be |
***************
|
|
|
55fd8be |
*** 59,65 ****
|
|
|
55fd8be |
int handle_x_keys __ARGS((int key));
|
|
|
55fd8be |
char_u *get_special_key_name __ARGS((int c, int modifiers));
|
|
|
55fd8be |
int trans_special __ARGS((char_u **srcp, char_u *dst, int keycode));
|
|
|
55fd8be |
! int find_special_key __ARGS((char_u **srcp, int *modp, int keycode));
|
|
|
55fd8be |
int extract_modifiers __ARGS((int key, int *modp));
|
|
|
55fd8be |
int find_special_key_in_table __ARGS((int c));
|
|
|
55fd8be |
int get_special_key_code __ARGS((char_u *name));
|
|
|
55fd8be |
--- 59,65 ----
|
|
|
55fd8be |
int handle_x_keys __ARGS((int key));
|
|
|
55fd8be |
char_u *get_special_key_name __ARGS((int c, int modifiers));
|
|
|
55fd8be |
int trans_special __ARGS((char_u **srcp, char_u *dst, int keycode));
|
|
|
55fd8be |
! int find_special_key __ARGS((char_u **srcp, int *modp, int keycode, int keep_x_key));
|
|
|
55fd8be |
int extract_modifiers __ARGS((int key, int *modp));
|
|
|
55fd8be |
int find_special_key_in_table __ARGS((int c));
|
|
|
55fd8be |
int get_special_key_code __ARGS((char_u *name));
|
|
|
55fd8be |
*** ../vim-7.2.072/src/version.c Wed Dec 24 12:43:15 2008
|
|
|
55fd8be |
--- src/version.c Wed Dec 24 12:51:26 2008
|
|
|
55fd8be |
***************
|
|
|
55fd8be |
*** 678,679 ****
|
|
|
55fd8be |
--- 678,681 ----
|
|
|
55fd8be |
{ /* Add new patch number below this line */
|
|
|
55fd8be |
+ /**/
|
|
|
55fd8be |
+ 73,
|
|
|
55fd8be |
/**/
|
|
|
55fd8be |
|
|
|
55fd8be |
|
|
|
55fd8be |
--
|
|
|
55fd8be |
ARTHUR: If you do not open these doors, we will take this castle by force ...
|
|
|
55fd8be |
[A bucket of slops land on ARTHUR. He tries to retain his dignity.]
|
|
|
55fd8be |
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
|
|
55fd8be |
|
|
|
55fd8be |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
55fd8be |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
55fd8be |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
55fd8be |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|