• R/O
  • SSH

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Revisión3a779b47f235a62d799147b25445b01866f7c0dd (tree)
Tiempo2006-03-14 07:18:45
Autorvimboss
Commitervimboss

Log Message

updated for version 7.0223

Cambiar Resumen

Diferencia incremental

diff -r ac005a544e24 -r 3a779b47f235 runtime/doc/todo.txt
--- a/runtime/doc/todo.txt Mon Mar 13 22:15:53 2006 +0000
+++ b/runtime/doc/todo.txt Mon Mar 13 22:18:45 2006 +0000
@@ -1,4 +1,4 @@
1-*todo.txt* For Vim version 7.0aa. Last change: 2006 Mar 12
1+*todo.txt* For Vim version 7.0aa. Last change: 2006 Mar 13
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -30,8 +30,12 @@
3030 *known-bugs*
3131 -------------------- Known bugs and current work -----------------------
3232
33-
34-Turn spelling into a separate feature? May require syn-hl.
33+- UNDO TREE:
34+ Make proper test for "g+" and "g-"
35+ Verify there are no memory leaks.
36+ Docs for "g+" and "g-", note in version7.txt
37+ Command to jump so many seconds forward/backward?
38+ Show the list of changes in a window to be able to select a version?
3539
3640 Win32: Describe how to do debugging. (George Reilly)
3741
@@ -51,22 +55,6 @@
5155
5256 CONSIDERED FOR VERSION 7.0:
5357
54-- UNDO TREE: keep all states of the text, don't delete undo info.
55- When making a change, instead of clearing any future undo (thus redo)
56- info, make a new branch.
57- To navigate through the undo tree number the states of the text
58- sequentially and make it possible to go through the tree in that order.
59- Use "g+++" to go forward, "g---" to go backward. Can mix - and +.
60- Could also use timestamps (to show the time and/or jump to a state five
61- minutes ago). (David Schweikert)
62- To go from one state to another: backtrack to a common state, then forward
63- again.
64- Only difficult thing: When going back in time, how to find the previous
65- text state in the tree?
66- Show the list of changes in a window to be able to select a version?
67- Also: See ":e" as a change operation, find the changes and add them to the
68- undo info. Needed for when an external tool changes the file.
69-
7058 - EMBEDDING: Make it possible to run Vim inside a window of another program.
7159 For Xwindows this can be done with XReparentWindow().
7260 For GTK Neil Bird has a patch to use Vim like a widget.
@@ -98,6 +86,8 @@
9886
9987 Add strtol() to avoid the problems with leading zero causing octal conversion.
10088
89+Updated Ruby interface. (Ryan Paul)
90+
10191 Add a 'tool' window: behaves like a preview window but there can be several.
10292 Don't count it in only_one_window(). (Alexei Alexandrov)
10393
@@ -125,8 +115,6 @@
125115
126116 Add more tests for all new functionality in Vim 7. Especially new functions.
127117
128-Updated Ruby interface. (Ryan Paul)
129-
130118 'errorformat' docs are a bit unclear. Suggestions by Charles Campbell (2006
131119 Jan 6)
132120 Add a flag to check for a match with the next item first? Helps for
@@ -2780,6 +2768,8 @@
27802768 before some time/date can be flushed. 'undopersist' gives maximum time to
27812769 keep undo: "3h", "1d", "2w", "1y", etc. For the file use dot and
27822770 extension: ".filename.un~" (like swapfile but "un~" instead of "swp").
2771+8 See ":e" as a change operation, find the changes and add them to the
2772+ undo info. Needed for when an external tool changes the file.
27832773 - Make it possible to undo all the commands from a mapping, including a
27842774 trailing unfinished command, e.g. for ":map K iX^[r".
27852775 - When accidentally hitting "R" instead of Ctrl-R, further Ctrl-R is not
@@ -2804,9 +2794,6 @@
28042794 [-99].
28052795 - With undo with simple line delete/insert: optimize screen updating.
28062796 - When executing macro's: Save each line for undo only once.
2807-- Store undo info in a file that survives until the next edit. Then it's
2808- possible to undo to before the current editing session. Combined with
2809- viminfo?
28102797 - When doing a global substitute, causing almost all lines to be changed,
28112798 undo info becomes very big. Put undo info in swap file??
28122799
diff -r ac005a544e24 -r 3a779b47f235 runtime/doc/version7.txt
--- a/runtime/doc/version7.txt Mon Mar 13 22:15:53 2006 +0000
+++ b/runtime/doc/version7.txt Mon Mar 13 22:18:45 2006 +0000
@@ -1,4 +1,4 @@
1-*version7.txt* For Vim version 7.0aa. Last change: 2006 Mar 12
1+*version7.txt* For Vim version 7.0aa. Last change: 2006 Mar 13
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -257,6 +257,9 @@
257257 The |:tab| command modifier can be used to have most commands that open a new
258258 window open a new tab instead.
259259
260+The |--remote-tab| argument can be used to edit a file in a new tab page in an
261+already running Vim server.
262+
260263 More info here: |tabpage|
261264
262265
diff -r ac005a544e24 -r 3a779b47f235 runtime/syntax/wsml.vim
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/runtime/syntax/wsml.vim Mon Mar 13 22:18:45 2006 +0000
@@ -0,0 +1,125 @@
1+" Vim syntax file
2+" Language: WSML
3+" Maintainer: Thomas Haselwanter <thomas.haselwanter@deri.org>
4+" URL: none
5+" Last Change: 2006 Mar 13
6+
7+" Quit when a syntax file was already loaded
8+if version < 600
9+ syntax clear
10+elseif exists("b:current_syntax")
11+ finish
12+endif
13+
14+" WSML
15+syn keyword wsmlHeader wsmlVariant
16+syn keyword wsmlNamespace namespace
17+syn keyword wsmlTopLevel concept instance relationInstance ofType usesMediator usesService relation sharedVariables importsOntology
18+syn keyword wsmlOntology hasValue memberOf ofType impliesType subConceptOf
19+syn keyword wsmlAxiom axiom definedBy
20+syn keyword wsmlService assumption effect postcondition precondition capability interface
21+syn keyword wsmlTopLevel ooMediator wwMediator wgMediator ggMediator
22+syn keyword wsmlMediation usesService source target
23+syn match wsmlDataTypes "\( _string\| _decimal\| _integer\| _float\| _double\| _iri\| _sqname\| _boolean\| _duration\| _dateTime\| _time\| _date\| _gyearmonth\| _gyear\| _gmonthday\| _gday\| _gmonth\| _hexbinary\| _base64binary\)\((\S*)\)\?" contains=wsmlString,wsmlNumber,wsmlCharacter
24+syn keyword wsmlTopLevel goal webService ontology
25+syn keyword wsmlKeywordsInsideLEs true false memberOf hasValue subConceptOf ofType impliesType and or implies impliedBy equivalent neg naf forall exists
26+syn keyword wsmlNFP nfp endnfp nonFunctionalProperties endNonFunctionalProperties
27+syn region wsmlNFPregion start="nfp\|nonFunctionalProperties" end="endnfp\|endNonFunctionalProperties" contains=ALL
28+syn region wsmlNamespace start="namespace" end="}" contains=wsmlIdentifier
29+syn match wsmlOperator "!=\|:=:\|=<\|>=\|=\|+\|\*\|/\|<->\|->\|<-\|:-\|!-\|-\|<\|>"
30+syn match wsmlBrace "(\|)\|\[\|\]\|{\|}"
31+syn match wsmlIdentifier +_"\S*"+
32+syn match wsmlIdentifier "_#\d*"
33+syn match wsmlSqName "[0-9A-Za-z]\+#[0-9A-Za-z]\+"
34+syn match wsmlVariable "?[0-9A-Za-z]\+"
35+
36+" ASM-specific code
37+syn keyword wsmlBehavioral choreography orchestration transitionRules
38+syn keyword wsmlChoreographyPri stateSignature in out shared static controlled
39+syn keyword wsmlChoreographySec with do withGrounding forall endForall choose if then endIf
40+syn match wsmlChoreographyTer "\(\s\|\_^\)\(add\|delete\|update\)\s*(.*)" contains=wsmlKeywordsInsideLEs,wsmlIdentifier,wsmlSqName,wsmlString,wsmlNumber,wsmlDataTypes,wsmlVariable
41+
42+" Comments
43+syn keyword wsmlTodo contained TODO
44+syn keyword wsmlFixMe contained FIXME
45+if exists("wsml_comment_strings")
46+ syn region wsmlCommentString contained start=+"+ end=+"+ end=+$+ end=+\*/+me=s-1,he=s-1 contains=wsmlSpecial,wsmlCommentStar,wsmlSpecialChar,@Spell
47+ syn region wsmlComment2String contained start=+"+ end=+$\|"+ contains=wsmlSpecial,wsmlSpecialChar,@Spell
48+ syn match wsmlCommentCharacter contained "'\\[^']\{1,6\}'" contains=wsmlSpecialChar
49+ syn match wsmlCommentCharacter contained "'\\''" contains=wsmlSpecialChar
50+ syn match wsmlCommentCharacter contained "'[^\\]'"
51+ syn cluster wsmlCommentSpecial add=wsmlCommentString,wsmlCommentCharacter,wsmlNumber
52+ syn cluster wsmlCommentSpecial2 add=wsmlComment2String,wsmlCommentCharacter,wsmlNumber
53+endif
54+
55+syn region wsmlComment start="/\*" end="\*/" contains=@wsmlCommentSpecial,wsmlTodo,wsmlFixMe,@Spell
56+syn match wsmlCommentStar contained "^\s*\*[^/]"me=e-1
57+syn match wsmlCommentStar contained "^\s*\*$"
58+syn match wsmlLineComment "//.*" contains=@wsmlCommentSpecial2,wsmlTodo,@Spell
59+
60+syn cluster wsmlTop add=wsmlComment,wsmlLineComment
61+
62+"match the special comment /**/
63+syn match wsmlComment "/\*\*/"
64+
65+" Strings
66+syn region wsmlString start=+"+ end=+"+ contains=wsmlSpecialChar,wsmlSpecialError,@Spell
67+syn match wsmlCharacter "'[^']*'" contains=javaSpecialChar,javaSpecialCharError
68+syn match wsmlCharacter "'\\''" contains=javaSpecialChar
69+syn match wsmlCharacter "'[^\\]'"
70+syn match wsmlNumber "\<\(0[0-7]*\|0[xX]\x\+\|\d\+\)[lL]\=\>"
71+syn match wsmlNumber "\(\<\d\+\.\d*\|\.\d\+\)\([eE][-+]\=\d\+\)\=[fFdD]\="
72+syn match wsmlNumber "\<\d\+[eE][-+]\=\d\+[fFdD]\=\>"
73+syn match wsmlNumber "\<\d\+\([eE][-+]\=\d\+\)\=[fFdD]\>"
74+
75+" unicode characters
76+syn match wsmlSpecial "\\u\d\{4\}"
77+
78+syn cluster wsmlTop add=wsmlString,wsmlCharacter,wsmlNumber,wsmlSpecial,wsmlStringError
79+
80+" Define the default highlighting.
81+" " For version 5.7 and earlier: only when not done already
82+" " For version 5.8 and later: only when an item doesn't have highlighting yet
83+ if version >= 508 || !exists("did_wsml_syn_inits")
84+ if version < 508
85+ let did_wsml_syn_inits = 1
86+ command -nargs=+ HiLink hi link <args>
87+ else
88+ command -nargs=+ HiLink hi def link <args>
89+ endif
90+ HiLink wsmlHeader TypeDef
91+ HiLink wsmlNamespace TypeDef
92+ HiLink wsmlOntology Statement
93+ HiLink wsmlAxiom TypeDef
94+ HiLink wsmlService TypeDef
95+ HiLink wsmlNFP TypeDef
96+ HiLink wsmlTopLevel TypeDef
97+ HiLink wsmlMediation TypeDef
98+ HiLink wsmlBehavioral TypeDef
99+ HiLink wsmlChoreographyPri TypeDef
100+ HiLink wsmlChoreographySec Operator
101+ HiLink wsmlChoreographyTer Special
102+ HiLink wsmlString String
103+ HiLink wsmlIdentifier Normal
104+ HiLink wsmlSqName Normal
105+ HiLink wsmlVariable Define
106+ HiLink wsmlKeywordsInsideLEs Operator
107+ HiLink wsmlOperator Operator
108+ HiLink wsmlBrace Operator
109+ HiLink wsmlCharacter Character
110+ HiLink wsmlNumber Number
111+ HiLink wsmlDataTypes Special
112+ HiLink wsmlComment Comment
113+ HiLink wsmlDocComment Comment
114+ HiLink wsmlLineComment Comment
115+ HiLink wsmlTodo Todo
116+ HiLink wsmlFixMe Error
117+ HiLink wsmlCommentTitle SpecialComment
118+ HiLink wsmlCommentStar wsmlComment
119+ endif
120+
121+delcommand HiLink
122+
123+let b:current_syntax = "wsml"
124+let b:spell_options="contained"
125+
diff -r ac005a544e24 -r 3a779b47f235 src/main.c
--- a/src/main.c Mon Mar 13 22:15:53 2006 +0000
+++ b/src/main.c Mon Mar 13 22:18:45 2006 +0000
@@ -2920,6 +2920,9 @@
29202920 main_msg(_("--remote-silent <files> Same, don't complain if there is no server"));
29212921 main_msg(_("--remote-wait <files> As --remote but wait for files to have been edited"));
29222922 main_msg(_("--remote-wait-silent <files> Same, don't complain if there is no server"));
2923+# ifdef FEAT_WINDOWS
2924+ main_msg(_("--remote-tab <files> As --remote but open tab page for each file"));
2925+# endif
29232926 main_msg(_("--remote-send <keys>\tSend <keys> to a Vim server and exit"));
29242927 main_msg(_("--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"));
29252928 main_msg(_("--serverlist\t\tList available Vim server names and exit"));
Show on old repository browser