]>
Commit | Line | Data |
---|---|---|
65bfde4c AG |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.2.073 | |
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.2.073 | |
11 | Problem: ":set <xHome>" has the same output as ":set <Home>". (Matt | |
12 | Wozniski) | |
13 | Solution: Don't translate "x" keys to its alternative for ":set". | |
14 | Files: src/misc2.c, src/option.c, src/proto/misc2.pro | |
15 | ||
16 | ||
17 | *** ../vim-7.2.072/src/misc2.c Wed Nov 12 13:07:48 2008 | |
18 | --- src/misc2.c Sun Dec 14 12:28:47 2008 | |
19 | *************** | |
20 | *** 2561,2567 **** | |
21 | int key; | |
22 | int dlen = 0; | |
23 | ||
24 | ! key = find_special_key(srcp, &modifiers, keycode); | |
25 | if (key == 0) | |
26 | return 0; | |
27 | ||
28 | --- 2561,2567 ---- | |
29 | int key; | |
30 | int dlen = 0; | |
31 | ||
32 | ! key = find_special_key(srcp, &modifiers, keycode, FALSE); | |
33 | if (key == 0) | |
34 | return 0; | |
35 | ||
36 | *************** | |
37 | *** 2597,2606 **** | |
38 | * returns 0 if there is no match. | |
39 | */ | |
40 | int | |
41 | ! find_special_key(srcp, modp, keycode) | |
42 | char_u **srcp; | |
43 | int *modp; | |
44 | ! int keycode; /* prefer key code, e.g. K_DEL instead of DEL */ | |
45 | { | |
46 | char_u *last_dash; | |
47 | char_u *end_of_name; | |
48 | --- 2597,2607 ---- | |
49 | * returns 0 if there is no match. | |
50 | */ | |
51 | int | |
52 | ! find_special_key(srcp, modp, keycode, keep_x_key) | |
53 | char_u **srcp; | |
54 | int *modp; | |
55 | ! int keycode; /* prefer key code, e.g. K_DEL instead of DEL */ | |
56 | ! int keep_x_key; /* don't translate xHome to Home key */ | |
57 | { | |
58 | char_u *last_dash; | |
59 | char_u *end_of_name; | |
60 | *************** | |
61 | *** 2668,2674 **** | |
62 | else | |
63 | { | |
64 | key = get_special_key_code(last_dash + 1); | |
65 | ! key = handle_x_keys(key); | |
66 | } | |
67 | ||
68 | /* | |
69 | --- 2669,2676 ---- | |
70 | else | |
71 | { | |
72 | key = get_special_key_code(last_dash + 1); | |
73 | ! if (!keep_x_key) | |
74 | ! key = handle_x_keys(key); | |
75 | } | |
76 | ||
77 | /* | |
78 | *** ../vim-7.2.072/src/option.c Fri Nov 28 21:26:50 2008 | |
79 | --- src/option.c Sun Dec 14 12:28:56 2008 | |
80 | *************** | |
81 | *** 8328,8334 **** | |
82 | { | |
83 | --arg; /* put arg at the '<' */ | |
84 | modifiers = 0; | |
85 | ! key = find_special_key(&arg, &modifiers, TRUE); | |
86 | if (modifiers) /* can't handle modifiers here */ | |
87 | key = 0; | |
88 | } | |
89 | --- 8328,8334 ---- | |
90 | { | |
91 | --arg; /* put arg at the '<' */ | |
92 | modifiers = 0; | |
93 | ! key = find_special_key(&arg, &modifiers, TRUE, TRUE); | |
94 | if (modifiers) /* can't handle modifiers here */ | |
95 | key = 0; | |
96 | } | |
97 | *** ../vim-7.2.072/src/proto/misc2.pro Thu Jul 24 20:29:37 2008 | |
98 | --- src/proto/misc2.pro Sun Dec 14 12:29:05 2008 | |
99 | *************** | |
100 | *** 59,65 **** | |
101 | int handle_x_keys __ARGS((int key)); | |
102 | char_u *get_special_key_name __ARGS((int c, int modifiers)); | |
103 | int trans_special __ARGS((char_u **srcp, char_u *dst, int keycode)); | |
104 | ! int find_special_key __ARGS((char_u **srcp, int *modp, int keycode)); | |
105 | int extract_modifiers __ARGS((int key, int *modp)); | |
106 | int find_special_key_in_table __ARGS((int c)); | |
107 | int get_special_key_code __ARGS((char_u *name)); | |
108 | --- 59,65 ---- | |
109 | int handle_x_keys __ARGS((int key)); | |
110 | char_u *get_special_key_name __ARGS((int c, int modifiers)); | |
111 | int trans_special __ARGS((char_u **srcp, char_u *dst, int keycode)); | |
112 | ! int find_special_key __ARGS((char_u **srcp, int *modp, int keycode, int keep_x_key)); | |
113 | int extract_modifiers __ARGS((int key, int *modp)); | |
114 | int find_special_key_in_table __ARGS((int c)); | |
115 | int get_special_key_code __ARGS((char_u *name)); | |
116 | *** ../vim-7.2.072/src/version.c Wed Dec 24 12:43:15 2008 | |
117 | --- src/version.c Wed Dec 24 12:51:26 2008 | |
118 | *************** | |
119 | *** 678,679 **** | |
120 | --- 678,681 ---- | |
121 | { /* Add new patch number below this line */ | |
122 | + /**/ | |
123 | + 73, | |
124 | /**/ | |
125 | ||
126 | ||
127 | -- | |
128 | ARTHUR: If you do not open these doors, we will take this castle by force ... | |
129 | [A bucket of slops land on ARTHUR. He tries to retain his dignity.] | |
130 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
131 | ||
132 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
133 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
134 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
135 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |