Skip to content

Commit d5ab34b

Browse files
brammoolbrammool
committed
updated for version 7.1a
1 parent 0630b8d commit d5ab34b

20 files changed

Lines changed: 317 additions & 231 deletions

‎README_ami.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
README_ami.txt for version 7.0 of Vim: Vi IMproved.
1+
README_ami.txt for version 7.1a of Vim: Vi IMproved.
22

33
This file explains the installation of Vim on Amiga systems.
44
See README.txt for general information about Vim.

‎runtime/autoload/htmlcomplete.vim‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim completion script
22
" Language: HTML and XHTML
33
" Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl )
4-
" Last Change: 2006 Apr 30
4+
" Last Change: 2006 Oct 19
55

66
function! htmlcomplete#CompleteTags(findstart, base)
77
if a:findstart
@@ -84,7 +84,7 @@ function! htmlcomplete#CompleteTags(findstart, base)
8484
let context_line = getline(curline-i)
8585
if context_line =~ '<[^>]*$'
8686
" Yep, this is this line
87-
let context_lines = getline(curline-i, curline)
87+
let context_lines = getline(curline-i, curline-1) + [b:compl_context]
8888
let b:compl_context = join(context_lines, ' ')
8989
break
9090
elseif context_line =~ '>[^<]*$' || i == curline
@@ -448,6 +448,15 @@ function! htmlcomplete#CompleteTags(findstart, base)
448448
let attrname = matchstr(attr, '.*\ze\s*=')
449449
let entered_value = matchstr(attr, ".*=\\s*[\"']\\?\\zs.*")
450450
let values = []
451+
" Load data {{{
452+
if !exists("b:html_doctype")
453+
call htmlcomplete#CheckDoctype()
454+
endif
455+
if !exists("b:html_omni")
456+
"runtime! autoload/xml/xhtml10s.vim
457+
call htmlcomplete#LoadData()
458+
endif
459+
" }}}
451460
if attrname == 'href'
452461
" Now we are looking for local anchors defined by name or id
453462
if entered_value =~ '^#'
@@ -604,21 +613,20 @@ function! htmlcomplete#CompleteTags(findstart, base)
604613
if exists("uppercase_tag") && uppercase_tag == 1
605614
let context = tolower(context)
606615
endif
607-
" Handle XML keywords: DOCTYPE and CDATA.
616+
" Handle XML keywords: DOCTYPE
608617
if opentag == ''
609618
let tags += [
610-
\ '!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">',
611-
\ '!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">',
612-
\ '!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">',
613-
\ '!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN" "http://www.w3.org/TR/REC-html40/frameset.dtd">',
614-
\ '!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
615-
\ '!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
616-
\ '!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
617-
\ '!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
618-
\ '!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
619-
\ '!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
620-
\ '!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/1999/xhtml">',
621-
\ '!CDATA'
619+
\ '!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">',
620+
\ '!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">',
621+
\ '!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">',
622+
\ '!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN" "http://www.w3.org/TR/REC-html40/frameset.dtd">',
623+
\ '!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
624+
\ '!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
625+
\ '!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
626+
\ '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
627+
\ '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
628+
\ '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
629+
\ '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/1999/xhtml">'
622630
\ ]
623631
endif
624632

‎runtime/doc/Makefile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ VIMEXE = vim
1414
include ../../src/auto/config.mk
1515

1616
DOCS = \
17+
ada.txt \
1718
arabic.txt \
1819
autocmd.txt \
1920
change.txt \
@@ -28,7 +29,6 @@ DOCS = \
2829
farsi.txt \
2930
filetype.txt \
3031
fold.txt \
31-
getscript.txt \
3232
gui.txt \
3333
gui_w16.txt \
3434
gui_w32.txt \
@@ -70,6 +70,7 @@ DOCS = \
7070
os_vms.txt \
7171
os_win32.txt \
7272
pattern.txt \
73+
pi_getscript.txt \
7374
pi_gzip.txt \
7475
pi_netrw.txt \
7576
pi_paren.txt \
@@ -144,6 +145,7 @@ DOCS = \
144145
workshop.txt
145146

146147
HTMLS = \
148+
ada.html \
147149
arabic.html \
148150
autocmd.html \
149151
change.html \
@@ -158,7 +160,6 @@ HTMLS = \
158160
farsi.html \
159161
filetype.html \
160162
fold.html \
161-
getscript.html \
162163
gui.html \
163164
gui_w16.html \
164165
gui_w32.html \
@@ -200,6 +201,7 @@ HTMLS = \
200201
os_vms.html \
201202
os_win32.html \
202203
pattern.html \
204+
pi_getscript.html \
203205
pi_gzip.html \
204206
pi_netrw.html \
205207
pi_paren.html \
@@ -224,8 +226,8 @@ HTMLS = \
224226
sql.html \
225227
syntax.html \
226228
tabpage.html \
227-
tagsrch.html \
228229
tags.html \
230+
tagsrch.html \
229231
term.html \
230232
tips.html \
231233
todo.html \

‎runtime/doc/gui.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*gui.txt* For Vim version 7.0. Last change: 2006 May 04
1+
*gui.txt* For Vim version 7.1a. Last change: 2006 Aug 08
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -510,7 +510,7 @@ floating menus that do not appear on the main menu bar.
510510
*:ime* *:imenu* *:inoreme* *:inoremenu*
511511
*:cme* *:cmenu* *:cnoreme* *:cnoremenu*
512512
*E330* *E327* *E331* *E336* *E333*
513-
*E328* *E329* *E337*
513+
*E328* *E329* *E337* *E792*
514514
To create a new menu item, use the ":menu" commands. They are mostly like
515515
the ":map" set of commands but the first argument is a menu item name, given
516516
as a path of menus and submenus with a '.' between them, e.g.: >

‎runtime/doc/os_qnx.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*os_qnx.txt* For Vim version 7.0. Last change: 2005 Mar 29
1+
*os_qnx.txt* For Vim version 7.1a. Last change: 2005 Mar 29
22

33

44
VIM REFERENCE MANUAL by Julian Kinraid

‎runtime/doc/os_vms.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*os_vms.txt* For Vim version 7.0. Last change: 2006 Apr 30
1+
*os_vms.txt* For Vim version 7.1a. Last change: 2006 Nov 18
22

33

44
VIM REFERENCE MANUAL
@@ -243,7 +243,7 @@ and to the SYS$STARTUP:SYLOGIN.COM >
243243
It will set up a normal Vim work environment for every user on the system.
244244

245245
IMPORTANT: Vim on OpenVMS (and on other case insensitive system) command line
246-
parameters are assumed to be lowecase. In order to indicate that a command
246+
parameters are assumed to be lowercase. In order to indicate that a command
247247
line parameter is uppercase "/" sign must be used.
248248

249249
Examples:

‎runtime/doc/usr_43.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*usr_43.txt* For Vim version 7.0. Last change: 2006 Apr 24
1+
*usr_43.txt* For Vim version 7.1a. Last change: 2006 Apr 24
22

33
VIM USER MANUAL - by Bram Moolenaar
44

‎runtime/doc/xxd-pl.1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ Wypisz trzy linie (heksowe 0x30 bajt
216216
\fI% xxd \-s \-0x30 plik
217217
.PP
218218
.br
219-
Wypisz 120 bajtów jako ciągły zrzut heksowy z 40 oktetami na linię.
219+
Wypisz 120 bajtów jako ciągły zrzut heksowy z 20 oktetami na linię.
220220
.br
221221
\fI% xxd \-l 120 \-ps \-c 20 xxd.1\fR
222222
.br

‎runtime/indent/php.vim‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
" Language: PHP
33
" Author: John Wellesz <John.wellesz (AT) teaser (DOT) fr>
44
" URL: http://www.2072productions.com/vim/indent/php.vim
5-
" Last Change: 2006 Apr 30
5+
" Last Change: 2007 February 25th
66
" Newsletter: http://www.2072productions.com/?to=php-indent-for-vim-newsletter.php
7-
" Version: 1.23
7+
" Version: 1.24
88
"
99
" The change log and all the comments have been removed from this file.
1010
"
@@ -68,12 +68,6 @@
6868
" NOTE: The script will be a bit slower if you use this option because
6969
" some optimizations won't be available.
7070

71-
72-
73-
74-
75-
76-
7771
if exists("b:did_indent")
7872
finish
7973
endif
@@ -137,7 +131,7 @@ endif
137131

138132
let s:endline= '\s*\%(//.*\|#.*\|/\*.*\*/\s*\)\=$'
139133
let s:PHP_startindenttag = '<?\%(.*?>\)\@!\|<script[^>]*>\%(.*<\/script>\)\@!'
140-
" setlocal debug=msg " XXX
134+
"setlocal debug=msg " XXX
141135

142136

143137
function! GetLastRealCodeLNum(startline) " {{{
@@ -205,6 +199,9 @@ function! GetLastRealCodeLNum(startline) " {{{
205199
if b:InPHPcode_and_script && !b:InPHPcode
206200
let b:InPHPcode_and_script = 0
207201
endif
202+
203+
204+
208205
return lnum
209206
endfunction " }}}
210207

@@ -221,7 +218,7 @@ endfun
221218

222219
function! Skippmatch() " {{{
223220
let synname = synIDattr(synID(line("."), col("."), 0), "name")
224-
if synname == "Delimiter" || synname == "phpParent" || synname == "javaScriptBraces" || synname == "phpComment" && b:UserIsTypingComment
221+
if synname == "Delimiter" || synname == "phpRegionDelimiter" || synname =~# "^phpParent" || synname == "phpArrayParens" || synname =~# '^php\%(Block\|Brace\)' || synname == "javaScriptBraces" || synname == "phpComment" && b:UserIsTypingComment
225222
return 0
226223
else
227224
return 1
@@ -380,7 +377,7 @@ function! GetPhpIndent()
380377
endif
381378

382379
if synname!=""
383-
if synname != "phpHereDoc"
380+
if synname != "phpHereDoc" && synname != "phpHereDocDelimiter"
384381
let b:InPHPcode = 1
385382
let b:InPHPcode_tofind = ""
386383

@@ -448,7 +445,7 @@ function! GetPhpIndent()
448445

449446
if b:InPHPcode
450447

451-
if !b:InPHPcode_and_script && last_line =~ '\%(<?.*\)\@<!?>\%(.*<?\)\@!' && IslinePHP(lnum, '?>')=="Delimiter"
448+
if !b:InPHPcode_and_script && last_line =~ '\%(<?.*\)\@<!?>\%(.*<?\)\@!' && IslinePHP(lnum, '?>')=~"Delimiter"
452449
if cline !~? s:PHP_startindenttag
453450
let b:InPHPcode = 0
454451
let b:InPHPcode_tofind = s:PHP_startindenttag
@@ -717,5 +714,3 @@ function! GetPhpIndent()
717714
let b:PHP_CurrentIndentLevel = ind
718715
return ind
719716
endfunction
720-
721-
" vim: set ts=8 sw=4 sts=4:

‎runtime/keymap/sinhala-phonetic_utf-8.vim‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
" Vim Keymap file for Sinhala (Sri Lanka) (2003-11-02)
2-
" Maintainer : Harshula Jayasuriya <[email protected]>
3-
" Last Updated: 2004-12-22
2+
" Maintainer : Harshula Jayasuriya <[email protected]>
3+
" Last Updated: 2006-06-08
44
" This is a static phonetic mapping for a standard US-English keyboard
55
" (qwerty)
66
" http://www.nongnu.org/sinhala/doc/keymaps/sinhala-keyboard_3.html
@@ -15,8 +15,8 @@
1515
let b:keymap_name = "sinhala"
1616

1717
loadkeymap
18-
V <char-0x0d82> " ං - anusvaraya (anusvara)
19-
<A-v> <char-0x0d83> " ඃ - visargaya (visarga)
18+
<A-n> <char-0x0d82> " ං - anusvaraya (anusvara)
19+
H <char-0x0d83> " ඃ - visargaya (visarga)
2020
a <char-0x0d85> " අ - ayanna (a)
2121
A <char-0x0d86> " ආ - aayanna (aa)
2222
w <char-0x0d87> " ඇ - aeyanna (ae)
@@ -31,15 +31,15 @@ Q <char-0x0d8e> " ඎ - iruuyanna (iruu)
3131
<A-K> <char-0x0d90> " ඐ - iluuyanna (iluu)
3232
e <char-0x0d91> " එ - eyanna (e)
3333
E <char-0x0d92> " ඒ - eeyanna (ee)
34-
F <char-0x0d93> " ඓ - aiyanna (ai)
34+
<A-F> <char-0x0d93> " ඓ - aiyanna (ai)
3535
o <char-0x0d94> " ඔ - oyanna (o)
3636
O <char-0x0d95> " ඕ - ooyanna (oo)
37-
H <char-0x0d96> " ඖ - auyanna (au)
37+
<A-H> <char-0x0d96> " ඖ - auyanna (au)
3838
k <char-0x0d9a> " ක - alpapraana kayanna (ka)
3939
K <char-0x0d9b> " ඛ - mahaapraana kayanna (kha)
4040
g <char-0x0d9c> " ග - alpapraana gayanna (ga)
4141
G <char-0x0d9d> " ඝ - mahaapraana gayanna (gha)
42-
<A-n> <char-0x0d9e> " ඞ - kantaja naasikyaya (nga)
42+
<A-N> <char-0x0d9e> " ඞ - kantaja naasikyaya (nga)
4343
<A-g> <char-0x0d9f> " ඟ - sanyaka gayanna (nnga)
4444
c <char-0x0da0> " ච - alpapraana cayanna (ca)
4545
C <char-0x0da1> " ඡ - mahaapraana cayanna (cha)

0 commit comments

Comments
 (0)