]> git.ipfire.org Git - ipfire-3.x.git/blob - vim/patches/vim-7.3.215.patch0
24d37fbfe3abd84d35f2997e230290c851c0c920
[ipfire-3.x.git] / vim / patches / vim-7.3.215.patch0
1 To: vim_dev@googlegroups.com
2 Subject: Patch 7.3.215
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.215 (after 7.3.210)
11 Problem: Wrong file names in previous patch. (Toothpik)
12 Solution: Include the option changes.
13 Files: src/option.c, src/option.h
14
15
16 *** ../mercurial/vim73/src/option.c 2011-05-19 13:40:47.000000000 +0200
17 --- src/option.c 2011-06-12 19:58:17.000000000 +0200
18 ***************
19 *** 901,906 ****
20 --- 901,913 ----
21 {(char_u *)0L, (char_u *)0L}
22 #endif
23 SCRIPTID_INIT},
24 + {"cscoperelative", "csre", P_BOOL|P_VI_DEF|P_VIM,
25 + #ifdef FEAT_CSCOPE
26 + (char_u *)&p_csre, PV_NONE,
27 + #else
28 + (char_u *)NULL, PV_NONE,
29 + #endif
30 + {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
31 {"cscopetag", "cst", P_BOOL|P_VI_DEF|P_VIM,
32 #ifdef FEAT_CSCOPE
33 (char_u *)&p_cst, PV_NONE,
34 *** ../mercurial/vim73/src/option.h 2011-05-19 13:40:47.000000000 +0200
35 --- src/option.h 2011-06-12 19:58:49.000000000 +0200
36 ***************
37 *** 391,396 ****
38 --- 391,397 ----
39 EXTERN char_u *p_cpo; /* 'cpoptions' */
40 #ifdef FEAT_CSCOPE
41 EXTERN char_u *p_csprg; /* 'cscopeprg' */
42 + EXTERN int p_csre; /* 'cscoperelative' */
43 # ifdef FEAT_QUICKFIX
44 EXTERN char_u *p_csqf; /* 'cscopequickfix' */
45 # define CSQF_CMDS "sgdctefi"
46 *** ../vim-7.3.214/src/version.c 2011-06-12 22:03:15.000000000 +0200
47 --- src/version.c 2011-06-12 22:12:34.000000000 +0200
48 ***************
49 *** 711,712 ****
50 --- 711,714 ----
51 { /* Add new patch number below this line */
52 + /**/
53 + 215,
54 /**/
55
56 --
57 hundred-and-one symptoms of being an internet addict:
58 171. You invent another person and chat with yourself in empty chat rooms.
59
60 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
61 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
62 \\\ an exciting new programming language -- http://www.Zimbu.org ///
63 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///