]>
Commit | Line | Data |
---|---|---|
bb09267f SS |
1 | Submitted By: Matt Burgess <matthew_at_linuxfromscratch_dot_org> |
2 | Date: 2008-12-06 | |
3 | Initial Package Version: 7.2 | |
4 | Upstream Status: Already in upstream patch repo | |
5 | Origin: Upstream | |
6 | Description: This patch is upstream patch numbers 1 thru 65. | |
7 | ||
8 | diff -Naur vim72.orig/Filelist vim72/Filelist | |
9 | --- vim72.orig/Filelist 2008-07-06 19:02:23.000000000 +0100 | |
10 | +++ vim72/Filelist 2008-12-06 11:37:48.000000000 +0000 | |
11 | @@ -285,6 +285,7 @@ | |
12 | src/proto/os_win32.pro \ | |
13 | src/proto/os_mswin.pro \ | |
14 | src/testdir/Make_dos.mak \ | |
15 | + src/testdir/Make_ming.mak \ | |
16 | src/testdir/dos.vim \ | |
17 | src/uninstal.c \ | |
18 | src/vim.def \ | |
19 | diff -Naur vim72.orig/runtime/doc/cmdline.txt vim72/runtime/doc/cmdline.txt | |
20 | --- vim72.orig/runtime/doc/cmdline.txt 2008-08-09 15:22:59.000000000 +0100 | |
21 | +++ vim72/runtime/doc/cmdline.txt 2008-12-06 11:37:49.000000000 +0000 | |
22 | @@ -1,4 +1,4 @@ | |
23 | -*cmdline.txt* For Vim version 7.2. Last change: 2008 Jul 29 | |
24 | +*cmdline.txt* For Vim version 7.2. Last change: 2008 Sep 18 | |
25 | ||
26 | ||
27 | VIM REFERENCE MANUAL by Bram Moolenaar | |
28 | @@ -157,6 +157,11 @@ | |
29 | (doesn't work at the expression prompt; some | |
30 | things such as changing the buffer or current | |
31 | window are not allowed to avoid side effects) | |
32 | + When the result is a |List| the items are used | |
33 | + as lines. They can have line breaks inside | |
34 | + too. | |
35 | + When the result is a Float it's automatically | |
36 | + converted to a String. | |
37 | See |registers| about registers. {not in Vi} | |
38 | Implementation detail: When using the |expression| register | |
39 | and invoking setcmdpos(), this sets the position before | |
40 | @@ -730,19 +735,29 @@ | |
41 | In Ex commands, at places where a file name can be used, the following | |
42 | characters have a special meaning. These can also be used in the expression | |
43 | function expand() |expand()|. | |
44 | - % is replaced with the current file name *:_%* | |
45 | - # is replaced with the alternate file name *:_#* | |
46 | + % Is replaced with the current file name. *:_%* *c_%* | |
47 | + # Is replaced with the alternate file name. *:_#* *c_#* | |
48 | #n (where n is a number) is replaced with the file name of | |
49 | - buffer n. "#0" is the same as "#" | |
50 | - ## is replaced with all names in the argument list *:_##* | |
51 | + buffer n. "#0" is the same as "#". | |
52 | + ## Is replaced with all names in the argument list *:_##* *c_##* | |
53 | concatenated, separated by spaces. Each space in a name | |
54 | is preceded with a backslash. | |
55 | -Note that these give the file name as it was typed. If an absolute path is | |
56 | -needed (when using the file name from a different directory), you need to add | |
57 | -":p". See |filename-modifiers|. | |
58 | + #<n (where n is a number > 0) is replaced with old *:_#<* *c_#<* | |
59 | + file name n. See |:oldfiles| or |v:oldfiles| to get the | |
60 | + number. *E809* | |
61 | + {only when compiled with the +eval and +viminfo features} | |
62 | + | |
63 | +Note that these, except "#<n", give the file name as it was typed. If an | |
64 | +absolute path is needed (when using the file name from a different directory), | |
65 | +you need to add ":p". See |filename-modifiers|. | |
66 | + | |
67 | +The "#<n" item returns an absolute path, but it will start with "~/" for files | |
68 | +below your home directory. | |
69 | + | |
70 | Note that backslashes are inserted before spaces, so that the command will | |
71 | correctly interpret the file name. But this doesn't happen for shell | |
72 | -commands. For those you probably have to use quotes: > | |
73 | +commands. For those you probably have to use quotes (this fails for files | |
74 | +that contain a quote and wildcards): > | |
75 | :!ls "%" | |
76 | :r !spell "%" | |
77 | ||
78 | diff -Naur vim72.orig/runtime/doc/eval.txt vim72/runtime/doc/eval.txt | |
79 | --- vim72.orig/runtime/doc/eval.txt 2008-08-09 15:22:59.000000000 +0100 | |
80 | +++ vim72/runtime/doc/eval.txt 2008-12-06 11:37:50.000000000 +0000 | |
81 | @@ -1,4 +1,4 @@ | |
82 | -*eval.txt* For Vim version 7.2. Last change: 2008 Aug 09 | |
83 | +*eval.txt* For Vim version 7.2. Last change: 2008 Nov 27 | |
84 | ||
85 | ||
86 | VIM REFERENCE MANUAL by Bram Moolenaar | |
87 | @@ -1484,6 +1484,17 @@ | |
88 | This is the screen column number, like with |virtcol()|. The | |
89 | value is zero when there was no mouse button click. | |
90 | ||
91 | + *v:oldfiles* *oldfiles-variable* | |
92 | +v:oldfiles List of file names that is loaded from the |viminfo| file on | |
93 | + startup. These are the files that Vim remembers marks for. | |
94 | + The length of the List is limited by the ' argument of the | |
95 | + 'viminfo' option (default is 100). | |
96 | + Also see |:oldfiles| and |c_#<|. | |
97 | + The List can be modified, but this has no effect on what is | |
98 | + stored in the |viminfo| file later. If you use values other | |
99 | + than String this will cause trouble. | |
100 | + {only when compiled with the +viminfo feature} | |
101 | + | |
102 | *v:operator* *operator-variable* | |
103 | v:operator The last operator given in Normal mode. This is a single | |
104 | character except for commands starting with <g> or <z>, | |
105 | @@ -1695,7 +1706,7 @@ | |
106 | exists( {expr}) Number TRUE if {expr} exists | |
107 | extend({expr1}, {expr2} [, {expr3}]) | |
108 | List/Dict insert items of {expr2} into {expr1} | |
109 | -expand( {expr}) String expand special keywords in {expr} | |
110 | +expand( {expr} [, {flag}]) String expand special keywords in {expr} | |
111 | feedkeys( {string} [, {mode}]) Number add key sequence to typeahead buffer | |
112 | filereadable( {file}) Number TRUE if {file} is a readable file | |
113 | filewritable( {file}) Number TRUE if {file} is a writable file | |
114 | @@ -1747,8 +1758,9 @@ | |
115 | getwinposx() Number X coord in pixels of GUI Vim window | |
116 | getwinposy() Number Y coord in pixels of GUI Vim window | |
117 | getwinvar( {nr}, {varname}) any variable {varname} in window {nr} | |
118 | -glob( {expr}) String expand file wildcards in {expr} | |
119 | -globpath( {path}, {expr}) String do glob({expr}) for all dirs in {path} | |
120 | +glob( {expr} [, {flag}]) String expand file wildcards in {expr} | |
121 | +globpath( {path}, {expr} [, {flag}]) | |
122 | + String do glob({expr}) for all dirs in {path} | |
123 | has( {feature}) Number TRUE if feature {feature} supported | |
124 | has_key( {dict}, {key}) Number TRUE if {dict} has entry {key} | |
125 | haslocaldir() Number TRUE if current window executed |:lcd| | |
126 | @@ -3275,14 +3287,16 @@ | |
127 | :let list_is_on = getwinvar(2, '&list') | |
128 | :echo "myvar = " . getwinvar(1, 'myvar') | |
129 | < | |
130 | - *glob()* | |
131 | -glob({expr}) Expand the file wildcards in {expr}. See |wildcards| for the | |
132 | +glob({expr} [, {flag}]) *glob()* | |
133 | + Expand the file wildcards in {expr}. See |wildcards| for the | |
134 | use of special characters. | |
135 | The result is a String. | |
136 | When there are several matches, they are separated by <NL> | |
137 | characters. | |
138 | - The 'wildignore' option applies: Names matching one of the | |
139 | - patterns in 'wildignore' will be skipped. | |
140 | + Unless the optional {flag} argument is given and is non-zero, | |
141 | + the 'suffixes' and 'wildignore' options apply: Names matching | |
142 | + one of the patterns in 'wildignore' will be skipped and | |
143 | + 'suffixes' affect the ordering of matches. | |
144 | If the expansion fails, the result is an empty string. | |
145 | A name for a non-existing file is not included. | |
146 | ||
147 | @@ -3296,20 +3310,22 @@ | |
148 | See |expand()| for expanding special Vim variables. See | |
149 | |system()| for getting the raw output of an external command. | |
150 | ||
151 | -globpath({path}, {expr}) *globpath()* | |
152 | +globpath({path}, {expr} [, {flag}]) *globpath()* | |
153 | Perform glob() on all directories in {path} and concatenate | |
154 | the results. Example: > | |
155 | :echo globpath(&rtp, "syntax/c.vim") | |
156 | < {path} is a comma-separated list of directory names. Each | |
157 | directory name is prepended to {expr} and expanded like with | |
158 | - glob(). A path separator is inserted when needed. | |
159 | + |glob()|. A path separator is inserted when needed. | |
160 | To add a comma inside a directory name escape it with a | |
161 | backslash. Note that on MS-Windows a directory may have a | |
162 | trailing backslash, remove it if you put a comma after it. | |
163 | If the expansion fails for one of the directories, there is no | |
164 | error message. | |
165 | - The 'wildignore' option applies: Names matching one of the | |
166 | - patterns in 'wildignore' will be skipped. | |
167 | + Unless the optional {flag} argument is given and is non-zero, | |
168 | + the 'suffixes' and 'wildignore' options apply: Names matching | |
169 | + one of the patterns in 'wildignore' will be skipped and | |
170 | + 'suffixes' affect the ordering of matches. | |
171 | ||
172 | The "**" item can be used to search in a directory tree. | |
173 | For example, to find all "README.txt" files in the directories | |
174 | @@ -5332,10 +5348,12 @@ | |
175 | "fg" foreground color (GUI: color name used to set | |
176 | the color, cterm: color number as a string, | |
177 | term: empty string) | |
178 | - "bg" background color (like "fg") | |
179 | + "bg" background color (as with "fg") | |
180 | + "sp" special color (as with "fg") |highlight-guisp| | |
181 | "fg#" like "fg", but for the GUI and the GUI is | |
182 | running the name in "#RRGGBB" form | |
183 | "bg#" like "fg#" for "bg" | |
184 | + "sp#" like "fg#" for "sp" | |
185 | "bold" "1" if bold | |
186 | "italic" "1" if italic | |
187 | "reverse" "1" if reverse | |
188 | diff -Naur vim72.orig/runtime/doc/options.txt vim72/runtime/doc/options.txt | |
189 | --- vim72.orig/runtime/doc/options.txt 2008-08-09 15:22:59.000000000 +0100 | |
190 | +++ vim72/runtime/doc/options.txt 2008-12-06 11:37:50.000000000 +0000 | |
191 | @@ -1,4 +1,4 @@ | |
192 | -*options.txt* For Vim version 7.2. Last change: 2008 Aug 06 | |
193 | +*options.txt* For Vim version 7.2. Last change: 2008 Nov 25 | |
194 | ||
195 | ||
196 | VIM REFERENCE MANUAL by Bram Moolenaar | |
197 | @@ -7472,7 +7472,9 @@ | |
198 | {not available when compiled without the |+wildignore| | |
199 | feature} | |
200 | A list of file patterns. A file that matches with one of these | |
201 | - patterns is ignored when completing file or directory names. | |
202 | + patterns is ignored when completing file or directory names, and | |
203 | + influences the result of |expand()|, |glob()| and |globpath()| unless | |
204 | + a flag is passed to disable this. | |
205 | The pattern is used like with |:autocmd|, see |autocmd-patterns|. | |
206 | Also see 'suffixes'. | |
207 | Example: > | |
208 | diff -Naur vim72.orig/runtime/doc/os_vms.txt vim72/runtime/doc/os_vms.txt | |
209 | --- vim72.orig/runtime/doc/os_vms.txt 2008-08-09 15:23:00.000000000 +0100 | |
210 | +++ vim72/runtime/doc/os_vms.txt 2008-12-06 11:37:48.000000000 +0000 | |
211 | @@ -1,4 +1,4 @@ | |
212 | -*os_vms.txt* For Vim version 7.2. Last change: 2006 Nov 18 | |
213 | +*os_vms.txt* For Vim version 7.2. Last change: 2008 Aug 19 | |
214 | ||
215 | ||
216 | VIM REFERENCE MANUAL | |
217 | @@ -312,7 +312,7 @@ | |
218 | ||
219 | 8. Useful notes *vms-notes* | |
220 | ||
221 | -8.1 backspace/delete | |
222 | +8.1 Backspace/delete | |
223 | 8.2 Filters | |
224 | 8.3 VMS file version numbers | |
225 | 8.4 Directory conversion | |
226 | @@ -326,8 +326,10 @@ | |
227 | 8.12 diff-mode | |
228 | 8.13 Allow '$' in C keywords | |
229 | 8.14 VIMTUTOR for beginners | |
230 | +8.15 Slow start in console mode issue | |
231 | +8.16 Common VIM directory - different architectures | |
232 | ||
233 | -8.1 backspace/delete | |
234 | +8.1 Backspace/delete | |
235 | ||
236 | There are backspace/delete key inconsistencies with VMS. | |
237 | :fixdel doesn't do the trick, but the solution is: > | |
238 | @@ -663,12 +665,130 @@ | |
239 | ||
240 | (Thomas.R.Wyant III, Vim 6.1) | |
241 | ||
242 | +8.14 Slow start in console mode issue | |
243 | + | |
244 | +As GUI/GTK Vim works equally well in console mode, many administartors | |
245 | +deploy those executables system wide. | |
246 | +Unfortunately, on a remote slow connections GUI/GTK executables behave rather | |
247 | +slow when user wants to run Vim just in the console mode - because of X environment detection timeout. | |
248 | + | |
249 | +Luckily, there is a simple solution for that. Administrators need to deploy | |
250 | +both GUI/GTK build and just console build executables, like below: > | |
251 | + | |
252 | + |- vim72 | |
253 | + |----- doc | |
254 | + |----- syntax | |
255 | + vimrc (system rc files) | |
256 | + gvimrc | |
257 | + gvim.exe (the remaned GUI or GTK built vim.exe) | |
258 | + vim.exe (the console only executable) | |
259 | + | |
260 | +Define system symbols like below in for ex in LOGIN.COM or SYLOGIN.COM: > | |
261 | + | |
262 | + $ define/nolog VIM RF10:[UTIL.VIM72] ! where you VIM directory is | |
263 | + $ vi*m :== mcr VIM:VIM.EXE | |
264 | + $ gvi*m :== mcr VIM:GVIM.EXE | |
265 | + $ ! or you can try to spawn with | |
266 | + $ gv*im :== spawn/nowait/input=NLA0 mcr VIM:GVIM.EXE -g -GEOMETRY 80x40 | |
267 | + | |
268 | + | |
269 | +Like this, users that do not have X environment and want to use Vim just in | |
270 | +console mode can avoid performance problems. | |
271 | + | |
272 | +(Zoltan Arpadffy, Vim 7.2) | |
273 | + | |
274 | +8.15 Common VIM directory - different architectures | |
275 | + | |
276 | +In a cluster that contains nodes with different architectures like below: | |
277 | + | |
278 | +$show cluster | |
279 | +View of Cluster from system ID 11655 node: TOR 18-AUG-2008 11:58:31 | |
280 | ++---------------------------------+ | |
281 |