]> git.ipfire.org Git - ipfire-3.x.git/blob - vim/patches/vim-7.3.384.patch0
vim: Import latest patches from upstream.
[ipfire-3.x.git] / vim / patches / vim-7.3.384.patch0
1 To: vim_dev@googlegroups.com
2 Subject: Patch 7.3.384
3 Fcc: outbox
4 From: Bram Moolenaar <Bram@moolenaar.net>
5 Mime-Version: 1.0
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
8 ------------
9
10 Patch 7.3.384
11 Problem: Mapping CTRL-K in Insert mode breaks CTRL-X CTRL-K for dictionary
12 completion.
13 Solution: Add CTRL-K to the list of recognized keys. (James McCoy)
14 Files: src/edit.c
15
16
17 *** ../vim-7.3.383/src/edit.c 2011-10-26 17:04:23.000000000 +0200
18 --- src/edit.c 2011-12-23 12:36:22.000000000 +0100
19 ***************
20 *** 2183,2189 ****
21 || c == Ctrl_I || c == Ctrl_D || c == Ctrl_P
22 || c == Ctrl_N || c == Ctrl_T || c == Ctrl_V
23 || c == Ctrl_Q || c == Ctrl_U || c == Ctrl_O
24 ! || c == Ctrl_S || c == 's');
25 case CTRL_X_SCROLL:
26 return (c == Ctrl_Y || c == Ctrl_E);
27 case CTRL_X_WHOLE_LINE:
28 --- 2183,2189 ----
29 || c == Ctrl_I || c == Ctrl_D || c == Ctrl_P
30 || c == Ctrl_N || c == Ctrl_T || c == Ctrl_V
31 || c == Ctrl_Q || c == Ctrl_U || c == Ctrl_O
32 ! || c == Ctrl_S || c == Ctrl_K || c == 's');
33 case CTRL_X_SCROLL:
34 return (c == Ctrl_Y || c == Ctrl_E);
35 case CTRL_X_WHOLE_LINE:
36 *** ../vim-7.3.383/src/version.c 2011-12-23 12:46:56.000000000 +0100
37 --- src/version.c 2011-12-23 12:53:38.000000000 +0100
38 ***************
39 *** 716,717 ****
40 --- 716,719 ----
41 { /* Add new patch number below this line */
42 + /**/
43 + 384,
44 /**/
45
46 --
47 Q: Is selling software the same as selling hardware?
48 A: No, good hardware is sold new, good software has already been used by many.
49
50 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
51 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
52 \\\ an exciting new programming language -- http://www.Zimbu.org ///
53 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///