]>
Commit | Line | Data |
---|---|---|
5634d1d6 ER |
1 | To: vim_dev@googlegroups.com |
2 | Subject: Patch 7.3.065 | |
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.065 | |
11 | Problem: Can't get current line number in a source file. | |
12 | Solution: Add the <slnum> item, similar to <sfile>. | |
13 | Files: src/ex_docmd.c | |
14 | ||
15 | ||
16 | *** ../vim-7.3.064/src/ex_docmd.c 2010-11-16 11:29:30.000000000 +0100 | |
17 | --- src/ex_docmd.c 2010-11-24 15:41:51.000000000 +0100 | |
18 | *************** | |
19 | *** 9538,9554 **** | |
20 | #define SPEC_CFILE 4 | |
21 | "<sfile>", /* ":so" file name */ | |
22 | #define SPEC_SFILE 5 | |
23 | #ifdef FEAT_AUTOCMD | |
24 | "<afile>", /* autocommand file name */ | |
25 | ! # define SPEC_AFILE 6 | |
26 | "<abuf>", /* autocommand buffer number */ | |
27 | ! # define SPEC_ABUF 7 | |
28 | "<amatch>", /* autocommand match name */ | |
29 | ! # define SPEC_AMATCH 8 | |
30 | #endif | |
31 | #ifdef FEAT_CLIENTSERVER | |
32 | "<client>" | |
33 | ! # define SPEC_CLIENT 9 | |
34 | #endif | |
35 | }; | |
36 | ||
37 | --- 9538,9560 ---- | |
38 | #define SPEC_CFILE 4 | |
39 | "<sfile>", /* ":so" file name */ | |
40 | #define SPEC_SFILE 5 | |
41 | + "<slnum>", /* ":so" file line number */ | |
42 | + #define SPEC_SLNUM 6 | |
43 | #ifdef FEAT_AUTOCMD | |
44 | "<afile>", /* autocommand file name */ | |
45 | ! # define SPEC_AFILE 7 | |
46 | "<abuf>", /* autocommand buffer number */ | |
47 | ! # define SPEC_ABUF 8 | |
48 | "<amatch>", /* autocommand match name */ | |
49 | ! # define SPEC_AMATCH 9 | |
50 | #endif | |
51 | #ifdef FEAT_CLIENTSERVER | |
52 | "<client>" | |
53 | ! # ifdef FEAT_AUTOCMD | |
54 | ! # define SPEC_CLIENT 10 | |
55 | ! # else | |
56 | ! # define SPEC_CLIENT 7 | |
57 | ! # endif | |
58 | #endif | |
59 | }; | |
60 | ||
61 | *************** | |
62 | *** 9573,9578 **** | |
63 | --- 9579,9585 ---- | |
64 | * '<cWORD>' to WORD under the cursor | |
65 | * '<cfile>' to path name under the cursor | |
66 | * '<sfile>' to sourced file name | |
67 | + * '<slnum>' to sourced file line number | |
68 | * '<afile>' to file name for autocommand | |
69 | * '<abuf>' to buffer number for autocommand | |
70 | * '<amatch>' to matching name for autocommand | |
71 | *************** | |
72 | *** 9604,9613 **** | |
73 | #ifdef FEAT_MODIFY_FNAME | |
74 | int skip_mod = FALSE; | |
75 | #endif | |
76 | - | |
77 | - #if defined(FEAT_AUTOCMD) || defined(FEAT_CLIENTSERVER) | |
78 | char_u strbuf[30]; | |
79 | - #endif | |
80 | ||
81 | *errormsg = NULL; | |
82 | if (escaped != NULL) | |
83 | --- 9611,9617 ---- | |
84 | *************** | |
85 | *** 9796,9801 **** | |
86 | --- 9800,9814 ---- | |
87 | return NULL; | |
88 | } | |
89 | break; | |
90 | + case SPEC_SLNUM: /* line in file for ":so" command */ | |
91 | + if (sourcing_name == NULL || sourcing_lnum == 0) | |
92 | + { | |
93 | + *errormsg = (char_u *)_("E842: no line number to use for \"<slnum>\""); | |
94 | + return NULL; | |
95 | + } | |
96 | + sprintf((char *)strbuf, "%ld", (long)sourcing_lnum); | |
97 | + result = strbuf; | |
98 | + break; | |
99 | #if defined(FEAT_CLIENTSERVER) | |
100 | case SPEC_CLIENT: /* Source of last submitted input */ | |
101 | sprintf((char *)strbuf, PRINTF_HEX_LONG_U, | |
102 | *** ../vim-7.3.064/src/version.c 2010-11-24 14:28:53.000000000 +0100 | |
103 | --- src/version.c 2010-11-24 15:49:57.000000000 +0100 | |
104 | *************** | |
105 | *** 716,717 **** | |
106 | --- 716,719 ---- | |
107 | { /* Add new patch number below this line */ | |
108 | + /**/ | |
109 | + 65, | |
110 | /**/ | |
111 | ||
112 | ||
113 | -- | |
114 | If you don't get everything you want, think of | |
115 | everything you didn't get and don't want. | |
116 | ||
117 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
118 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
119 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
120 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |