Skip to content

Commit b857e2d

Browse files
committed
More runtime file fixes for 'compatible' mode.
1 parent b0bc4bf commit b857e2d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+264
-59
lines changed

runtime/compiler/decada.vim

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@
1515
" Help Page: compiler-decada
1616
"------------------------------------------------------------------------------
1717

18-
let s:keepcpo= &cpo
19-
set cpo&vim
20-
21-
if (exists("current_compiler") &&
22-
\ current_compiler == "decada") ||
23-
\ version < 700
18+
if (exists("current_compiler") && current_compiler == "decada") || version < 700
2419
finish
2520
endif
21+
let s:keepcpo= &cpo
22+
set cpo&vim
2623

2724
let current_compiler = "decada"
2825

runtime/doc/change.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*change.txt* For Vim version 7.3. Last change: 2012 Apr 25
1+
*change.txt* For Vim version 7.3. Last change: 2012 Apr 30
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -260,6 +260,12 @@ r{char} Replace the character under the cursor with {char}.
260260
<CR>. CTRL-V <NL> replaces with a <Nul>.
261261
{Vi: CTRL-V <CR> still replaces with a line break,
262262
cannot replace something with a <CR>}
263+
264+
If {char} is CTRL-E or CTRL-Y the character from the
265+
line below or above is used, just like with |i_CTRL-E|
266+
and |i_CTRL-Y|. This also works with a count, thus
267+
`10r<C-E>` copies 10 characters from the line below.
268+
263269
If you give a [count], Vim replaces [count] characters
264270
with [count] {char}s. When {char} is a <CR> or <NL>,
265271
however, Vim inserts only one <CR>: "5r<CR>" replaces

runtime/doc/eval.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 7.3. Last change: 2012 Apr 25
1+
*eval.txt* For Vim version 7.3. Last change: 2012 Apr 30
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -5964,6 +5964,8 @@ undofile({name}) *undofile()*
59645964
the undo file exists.
59655965
{name} is always expanded to the full path, since that is what
59665966
is used internally.
5967+
If {name} is empty undofile() returns an empty string, since a
5968+
buffer without a file name will not write an undo file.
59675969
Useful in combination with |:wundo| and |:rundo|.
59685970
When compiled without the +persistent_undo option this always
59695971
returns an empty string.

runtime/doc/todo.txt

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 7.3. Last change: 2012 Apr 30
1+
*todo.txt* For Vim version 7.3. Last change: 2012 May 01
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -34,16 +34,15 @@ not be repeated below, unless there is extra information.
3434
*known-bugs*
3535
-------------------- Known bugs and current work -----------------------
3636

37+
patch to fix helphelp.txt from Ken Takata. https://gist.github.com/2559599
38+
3739
Go through more coverity reports.
3840

3941
Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10)
4042

4143
Stack trace of crash: http://vpaste.net/GBt9S
4244
(Alexandre Provencio)
4345

44-
Once syntax and other runtime files have been fixed: add "set cp" to
45-
check.vim. Use a function to run both with 'cp' and 'nocp'.
46-
4746
GTK: problem with 'L' in 'guioptions' changing the window width.
4847
(Aaron Cornelius, 2012 Feb 6)
4948

@@ -54,10 +53,6 @@ Win32: When a directory name contains an exclamation mark, completion doesn't
5453
complete the contents of the directory. No escaping for the "!"? (Jan
5554
Stocker, 2012 Jan 5)
5655

57-
Patch for crash involving curwin->w_s. (Christian Brabandt, 2012 Apr 20)
58-
What is the cause? Leaks memory? Other solution?
59-
More debug info Apr 26. Patch with proper fix Apr 26. Update 28 Apr.
60-
6156
Issue 54: document behavior of -complete, also expands arg.
6257

6358
Cursor on wrong line after ":copen". (John Beckett, 2012 Apr 30)
@@ -81,12 +76,6 @@ When running Vim in silent ex mode, an existing swapfile causes Vim to wait
8176
for a user action without a prompt. (Maarten Billemont, 2012 Feb 3)
8277
Do give the prompt? Quit with an error?
8378

84-
Patch for undofile(). (Christian Brabandt, 2012 Apr 27)
85-
86-
Patch for: (Christian Brabandt, 2011 Aug 22)
87-
- Make it possible to enter "r<C-E>" and "r<C-Y>" (get character from line
88-
below/above).
89-
9079
Patch for: (Christian Brabandt, 2011 Aug 24, updated patch)
9180
8 ":sign unplace * file={filename}" should work. Also: ":sign unplace *
9281
buffer={bufnr}". So one can remove all signs for one file/buffer.
@@ -101,8 +90,6 @@ Name it "CompleteFuncDone".
10190
Patch for Make_mvc.mak and Make_ming.mak for Ruby support. (Yasuhiro
10291
Matsumoto, 2012 Jan 30)
10392

104-
Patch to add completion for :history command. (Dominique Pelle, 2012 Feb 26)
105-
10693
Patch for 'backupcopy' default behavior for symlinks on Windows. (David Pope,
10794
2012 Mar 21, update Mar 31)
10895

runtime/ftplugin/qf.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim filetype plugin file
22
" Language: Vim's quickfix window
33
" Maintainer: Lech Lorens <[email protected]>
4-
" Last Changed: 18 Dec 2010
4+
" Last Changed: 30 Apr 2012
55

66
if exists("b:did_ftplugin")
77
finish
@@ -13,4 +13,4 @@ let b:did_ftplugin = 1
1313
let b:undo_ftplugin = "set stl<"
1414

1515
" Display the command that produced the list in the quickfix window:
16-
setlocal stl=%t%{exists('w:quickfix_title')?\ '\ '.w:quickfix_title\ :\ ''}
16+
setlocal stl=%t%{exists('w:quickfix_title')?\ '\ '.w:quickfix_title\ :\ ''}\ %=%-15(%l,%c%V%)\ %P

runtime/indent/ada.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
if exists("b:did_indent") || version < 700
2929
finish
3030
endif
31-
let s:keepcpo= &cpo
32-
set cpo&vim
3331

3432
let b:did_indent = 45
3533

@@ -41,6 +39,8 @@ setlocal indentkeys+=0=~then,0=~end,0=~elsif,0=~when,0=~exception,0=~begin,0=~is
4139
if exists("*GetAdaIndent")
4240
finish
4341
endif
42+
let s:keepcpo= &cpo
43+
set cpo&vim
4444

4545
if exists("g:ada_with_gnat_project_files")
4646
let s:AdaBlockStart = '^\s*\(if\>\|while\>\|else\>\|elsif\>\|loop\>\|for\>.*\<\(loop\|use\)\>\|declare\>\|begin\>\|type\>.*\<is\>[^;]*$\|\(type\>.*\)\=\<record\>\|procedure\>\|function\>\|accept\>\|do\>\|task\>\|package\>\|project\>\|then\>\|when\>\|is\>\)'

runtime/indent/python.vim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22
" Language: Python
33
" Maintainer: Bram Moolenaar <[email protected]>
44
" Original Author: David Bustos <[email protected]>
5-
" Last Change: 2012 Apr 30
5+
" Last Change: 2012 May 01
66

77
" Only load this indent file when no other was loaded.
88
if exists("b:did_indent")
99
finish
1010
endif
1111
let b:did_indent = 1
12-
let s:keepcpo= &cpo
13-
set cpo&vim
1412

1513
" Some preliminary settings
1614
setlocal nolisp " Make sure lisp indenting doesn't supersede us
@@ -23,6 +21,8 @@ setlocal indentkeys+=<:>,=elif,=except
2321
if exists("*GetPythonIndent")
2422
finish
2523
endif
24+
let s:keepcpo= &cpo
25+
set cpo&vim
2626

2727
" Come here when loading the script the first time.
2828

runtime/lang/menu_af_af.latin1.vim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
" Menu Translations: Afrikaas
22
" Maintainer: Danie Roux <[email protected]>
3-
" Last Change: 2012 Apr 30
3+
" Last Change: 2012 May 01
44

55
" Quit when menu translations have already been done.
66
if exists("did_menu_trans")
@@ -153,5 +153,5 @@ menutrans Co&lor\ test Toets\ die\ &kleure
153153
menutrans &Highlight\ test Toets\ die\ verligting
154154
menutrans &Convert\ to\ HTML Verwissel\ na\ HTML
155155

156-
let s:keepcpo= &cpo
157-
set cpo&vim
156+
let &cpo = s:keepcpo
157+
unlet s:keepcpo

runtime/lang/menu_ca_es.latin1.vim

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ if exists("did_menu_trans")
99
finish
1010
endif
1111
let did_menu_trans = 1
12+
let s:keepcpo= &cpo
13+
set cpo&vim
1214

1315
" The translations below are in latin1, but they work for cp1252,
1416
" iso-8859-15 without conversion as well.
@@ -311,3 +313,5 @@ menutrans Config Configuraci
311313
menutrans Set\ '&syntax'\ only Només\ el\ ressalt\ de\ sintaxi
312314
menutrans Set\ '&filetype'\ too Carrega\ també\ els\ plugins
313315

316+
let &cpo = s:keepcpo
317+
unlet s:keepcpo

runtime/lang/menu_chinese_gb.936.vim

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ if exists("did_menu_trans")
99
finish
1010
endif
1111
let did_menu_trans = 1
12+
let s:keepcpo= &cpo
13+
set cpo&vim
1214

1315
scriptencoding cp936
1416

@@ -261,3 +263,6 @@ menutrans &Highlight\ test
261263
menutrans &Convert\ to\ HTML 转换成\ HTML(&C)
262264
menutrans Set\ '&syntax'\ only 仅设定\ 'syntax'(&S)
263265
menutrans Set\ '&filetype'\ too 也设定\ 'filetype'(&F)
266+
267+
let &cpo = s:keepcpo
268+
unlet s:keepcpo

0 commit comments

Comments
 (0)