updated for version 7.0081
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index c61f6b5..a8493c9 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 7.0aa. Last change: 2005 May 31
+*options.txt* For Vim version 7.0aa. Last change: 2005 Jun 06
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -4294,7 +4294,6 @@
h all previous modes when editing a help file
a all previous modes
r for |hit-enter| and |more-prompt| prompt
- A auto-select in Visual mode
Normally you would enable the mouse in all four modes with: >
:set mouse=a
< When the mouse is not enabled, the GUI will still use the mouse for
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index 79419b2..df1ea54 100644
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -1,4 +1,4 @@
-*spell.txt* For Vim version 7.0aa. Last change: 2005 Jun 04
+*spell.txt* For Vim version 7.0aa. Last change: 2005 Jun 06
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -160,6 +160,9 @@
into one en.spl file.
Up to eight regions can be combined. *E754* *755*
+ When the spell file was written all currently used
+ spell files will be reloaded.
+
Since you might want to change the word list for use with Vim the following
procedure is recommended:
@@ -205,10 +208,14 @@
items are:
- Empty and blank lines are ignored.
- Lines starting with a # are ignored (comment lines).
-- A line starting with "=encoding=" before any word. After the second '='
- comes an encoding name. This tells Vim to setup conversion from the
- specified encoding to 'encoding'.
-- Other lines starting with '=' are special. The ones that are not recognized
+- A line starting with "/encoding=", before any word, specifies the encoding
+ of the file. After the second '=' comes an encoding name. This tells Vim
+ to setup conversion from the specified encoding to 'encoding'.
+- A line starting with "/?" specifies a word that should be marked as rare.
+- A line starting with "/!" specifies a word that should be marked as bad.
+- A line starting with "/=" specifies a word where case must match exactly.
+ A "?" or "!" may be following: "/=?" and "/=!".
+- Other lines starting with '/' are special. The ones that are not recognized
are ignored (but you do get a warning message).
@@ -273,6 +280,9 @@
ALS ALS als Als ALs AlS aLs aLS
AlS AlS ALS als Als ALs aLs aLS
+The HUH affix ID can be used to specifically match a word in identical case
+only, see below.
+
Note in line 5 to 7 that non-word characters are used. You can include
any character in a word. When checking the text a word still only matches
when it appears with a non-word character before and after it. For Myspell a
@@ -282,9 +292,10 @@
letters that indicate the affixes that can be used with this word.
*spell-affix-vim*
-A flag that Vim adds and is not in Myspell is the "=" flag. This has the
-meaning that case matters. This can be used if the word does not have the
-first letter in upper case at the start of a sentence. Example:
+A flag that Vim adds and is not in Myspell is the flag defined with HUH in the
+affix file. This has the meaning that case matters. This can be used if the
+word does not have the first letter in upper case at the start of a sentence.
+Example:
word list matches does not match ~
's morgens/= 's morgens 'S morgens 's Morgens
@@ -311,9 +322,9 @@
*E761* *E762*
Three lines in the affix file are needed. Simplistic example:
- FOL áëñáëñ
- LOW áëñáëñ
- UPP áëñÁËÑ
+ FOL áëñáëñ ~
+ LOW áëñáëñ ~
+ UPP áëñÁËÑ ~
All three lines must have exactly the same number of characters.
@@ -338,4 +349,22 @@
characters, so that it can be combine with spell files for any encoding.
+In the affix file a HUH line can be used to define the affix name used for
+keep-case words. Example:
+
+ HUH = ~
+
+See above for an example |spell-affix-vim|.
+
+
+In the affix file a RAR line can be used to define the affix name used for
+rare words. Example:
+
+ RAR ? ~
+
+Rare words are highlighted differently from bad words. This is to be used for
+words that are correct for the language, but are hardly ever used and could be
+a typing mistake anyway.
+
+
vim:tw=78:sw=4:ts=8:ft=help:norl:
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
index 3e87290..daad187 100644
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -1,4 +1,4 @@
-*term.txt* For Vim version 7.0aa. Last change: 2005 Mar 14
+*term.txt* For Vim version 7.0aa. Last change: 2005 Jun 06
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -594,7 +594,6 @@
h all previous modes when in a help file
a all previous modes
r for |hit-enter| prompt
- A auto-select in Visual mode
The default for 'mouse' is empty, the mouse is not used. Normally you would
do: >
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 1662362..c402cd9 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 7.0aa. Last change: 2005 Jun 05
+*todo.txt* For Vim version 7.0aa. Last change: 2005 Jun 06
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -99,12 +99,16 @@
Use array with flags, indicating if there is a word starting with this
byte. Quickly skip bytes where no word can start.
- Spell checking code todo's:
- - Implement user and project word lists. Commands to add words and to
- mark words as wrong.
- Also allow replacing a word list. Need some mechanism to tell
wether a spell file adds or replaces one found later in
'runtimepath'.
- - Implement = flag in .dic: KEEPCASE for lower case word.
+ - Is "-" to be considered a word character? "last-minute".
+ No, in Dutch it can be added optionally. Then make English
+ dictionaries consistent.
+ - Implement user and project word lists. Commands to add words and to
+ mark words as wrong.
+ - In .aff use RAR to define affix name for rare word.
+ - In .aff use HUH to define affix name for keep-case word.
's morgens/= does not match 'S morgens
- Implement compound words?
- When @Spell and @NoSpell are both used only do spell checking for
@@ -413,8 +417,6 @@
Vi incompatibility:
-9 In Ex mode, "u" undoes all changes, not just the last one. (John Cowan)
-8 In Ex mode, an empty file doesn't have a first line, "1p" should fail.
8 With undo/redo only marks in the changed lines should be changed. Other
marks should be kept. Vi keeps each mark at the same text, even when it
is deleted or restored. (Webb)
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index d8cf0cd..4e21c0a 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt* For Vim version 7.0aa. Last change: 2005 Jun 05
+*version7.txt* For Vim version 7.0aa. Last change: 2005 Jun 06
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -255,7 +255,8 @@
- Autoindent for ":change" is using the first changed line.
- Editing Ex command lines is not done in cooked mode, because CTRL-D and
CTRL-T cannot be handled then.
-- In Ex mode, "1,3" prints three lines.
+- In Ex mode, "1,3" prints three lines. "%" prints all lines.
+- In Ex mode "undo" would undo all changes since Ex mode was started.
- Implemented the 'prompt' option.
diff --git a/runtime/spell/en.ascii.spl b/runtime/spell/en.ascii.spl
index d1a42e0..a90bb07 100644
--- a/runtime/spell/en.ascii.spl
+++ b/runtime/spell/en.ascii.spl
Binary files differ
diff --git a/runtime/spell/en.latin1.spl b/runtime/spell/en.latin1.spl
index 36f9b67..6748269 100644
--- a/runtime/spell/en.latin1.spl
+++ b/runtime/spell/en.latin1.spl
Binary files differ
diff --git a/runtime/syntax/logtalk.vim b/runtime/syntax/logtalk.vim
index 480220c..eee998d 100644
--- a/runtime/syntax/logtalk.vim
+++ b/runtime/syntax/logtalk.vim
@@ -2,7 +2,7 @@
"
" Language: Logtalk
" Maintainer: Paulo Moura <pmoura@logtalk.org>
-" Last Change: May 30, 2005
+" Last Change: June 6, 2005
" Quit when a syntax file was already loaded:
@@ -48,23 +48,25 @@
" Logtalk opening entity directives
-syn region logtalkOpenEntityDir matchgroup=logtalkOpenEntityDirTag start=":- object(" matchgroup=logtalkOpenEntityDirTag end=")\." contains=ALL
-syn region logtalkOpenEntityDir matchgroup=logtalkOpenEntityDirTag start=":- protocol(" matchgroup=logtalkOpenEntityDirTag end=")\." contains=ALL
-syn region logtalkOpenEntityDir matchgroup=logtalkOpenEntityDirTag start=":- category(" matchgroup=logtalkOpenEntityDirTag end=")\." contains=ALL
+syn region logtalkOpenEntityDir matchgroup=logtalkOpenEntityDirTag start=":- object(" matchgroup=logtalkOpenEntityDirTag end=")\." contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator,logtalkEntityRel
+syn region logtalkOpenEntityDir matchgroup=logtalkOpenEntityDirTag start=":- protocol(" matchgroup=logtalkOpenEntityDirTag end=")\." contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator,logtalkEntityRel
+syn region logtalkOpenEntityDir matchgroup=logtalkOpenEntityDirTag start=":- category(" matchgroup=logtalkOpenEntityDirTag end=")\." contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator,logtalkEntityRel
" Logtalk closing entity directives
-syn match logtalkCloseEntityDir ":- end_\(object\|protocol\|category\)\."
+syn match logtalkCloseEntityDir ":- end_object\."
+syn match logtalkCloseEntityDir ":- end_protocol\."
+syn match logtalkCloseEntityDir ":- end_category\."
" Logtalk entity relations
-syn region logtalkEntityRel matchgroup=logtalkEntityRelTag start="instantiates(" matchgroup=logtalkEntityRelTag end=")" contains=logtalkEntity contained
-syn region logtalkEntityRel matchgroup=logtalkEntityRelTag start="specializes(" matchgroup=logtalkEntityRelTag end=")" contains=logtalkEntity contained
-syn region logtalkEntityRel matchgroup=logtalkEntityRelTag start="extends(" matchgroup=logtalkEntityRelTag end=")" contains=logtalkEntity contained
-syn region logtalkEntityRel matchgroup=logtalkEntityRelTag start="imports(" matchgroup=logtalkEntityRelTag end=")" contains=logtalkEntity contained
-syn region logtalkEntityRel matchgroup=logtalkEntityRelTag start="implements(" matchgroup=logtalkEntityRelTag end=")" contains=logtalkEntity contained
+syn region logtalkEntityRel matchgroup=logtalkEntityRelTag start="instantiates(" matchgroup=logtalkEntityRelTag end=")" contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator contained
+syn region logtalkEntityRel matchgroup=logtalkEntityRelTag start="specializes(" matchgroup=logtalkEntityRelTag end=")" contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator contained
+syn region logtalkEntityRel matchgroup=logtalkEntityRelTag start="extends(" matchgroup=logtalkEntityRelTag end=")" contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator contained
+syn region logtalkEntityRel matchgroup=logtalkEntityRelTag start="imports(" matchgroup=logtalkEntityRelTag end=")" contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator contained
+syn region logtalkEntityRel matchgroup=logtalkEntityRelTag start="implements(" matchgroup=logtalkEntityRelTag end=")" contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator contained
" Logtalk directives
@@ -297,9 +299,9 @@
syn match logtalkNumber "\<\d\+\.\d\+\>"
syn match logtalkNumber "\<\d\+[eE][-+]\=\d\+\>"
syn match logtalkNumber "\<\d\+\.\d\+[eE][-+]\=\d\+\>"
-syn match logtalkNumber "\<0'[0-9a-zA-Z]\>"
+syn match logtalkNumber "\<0'.\>"
syn match logtalkNumber "\<0b[0-1]\+\>"
-syn match logtalkNumber "\<0o[0-7]\+\>"
+syn match logtalkNumber "\<0o\o\+\>"
syn match logtalkNumber "\<0x\x\+\>"
@@ -310,10 +312,17 @@
" Logtalk comments
-syn region logtalkBlockComment start="/\*" end="\*/"
+syn region logtalkBlockComment start="/\*" end="\*/" fold
syn match logtalkLineComment "%.*"
+" Logtalk entity folding
+
+syn region logtalkEntity transparent fold keepend start=":- object(" end=":- end_object\." contains=ALL
+syn region logtalkEntity transparent fold keepend start=":- protocol(" end=":- end_protocol\." contains=ALL
+syn region logtalkEntity transparent fold keepend start=":- category(" end=":- end_category\." contains=ALL
+
+
syn sync ccomment logtalkBlockComment maxlines=50
@@ -370,3 +379,5 @@
let b:current_syntax = "logtalk"
setlocal ts=4
+setlocal fdm=syntax
+setlocal fdc=2