aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.0c12

Browse Source
This commit is contained in:
Bram Moolenaar
2006-04-07 21:40:07 +00:00
parent 5555acc08e
commit 61660eadce
12 changed files with 106 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/doc/autocmd.txt
View File

@@ -1,4 +1,4 @@
*autocmd.txt* For Vim version 7.0c. Last change: 2006 Apr 04 *autocmd.txt* For Vim version 7.0c. Last change: 2006 Apr 07
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@@ -506,8 +506,8 @@ FileChangedRO Before making the first change to a read-only
the change was caused by an autocommand. the change was caused by an autocommand.
This event is triggered when making the first This event is triggered when making the first
change in a buffer or the first change after change in a buffer or the first change after
'readonly' was set, 'readonly' was set, just before the change is
just before the change is applied to the text. applied to the text.
WARNING: If the autocommand moves the cursor WARNING: If the autocommand moves the cursor
the effect of the change is undefined. the effect of the change is undefined.
*E788* *E788*

6
runtime/doc/eval.txt
View File

@@ -1,4 +1,4 @@
*eval.txt* For Vim version 7.0c. Last change: 2006 Apr 04 *eval.txt* For Vim version 7.0c. Last change: 2006 Apr 06
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@@ -819,7 +819,7 @@ Number. Note that this doesn't recognize multi-byte encodings.
Index zero gives the first character. This is like it works in C. Careful: Index zero gives the first character. This is like it works in C. Careful:
text column numbers start with one! Example, to get the character under the text column numbers start with one! Example, to get the character under the
cursor: > cursor: >
:let c = getline(line("."))[col(".") - 1] :let c = getline(".")[col(".") - 1]
If the length of the String is less than the index, the result is an empty If the length of the String is less than the index, the result is an empty
String. A negative index always results in an empty string (reason: backwards String. A negative index always results in an empty string (reason: backwards
@@ -4562,7 +4562,7 @@ strpart({src}, {start}[, {len}]) *strpart()*
strpart("abcdefg", 3) == "defg" strpart("abcdefg", 3) == "defg"
< Note: To get the first character, {start} must be 0. For < Note: To get the first character, {start} must be 0. For
example, to get three bytes under and after the cursor: > example, to get three bytes under and after the cursor: >
strpart(getline(line(".")), col(".") - 1, 3) strpart(getline("."), col(".") - 1, 3)
< <
strridx({haystack}, {needle} [, {start}]) *strridx()* strridx({haystack}, {needle} [, {start}]) *strridx()*
The result is a Number, which gives the byte index in The result is a Number, which gives the byte index in

4
runtime/doc/syntax.txt
View File

@@ -1,4 +1,4 @@
*syntax.txt* For Vim version 7.0c. Last change: 2006 Apr 04 *syntax.txt* For Vim version 7.0c. Last change: 2006 Apr 06
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2581,7 +2581,7 @@ somewhere else with "P".
Do you want to draw with the mouse? Try the following: > Do you want to draw with the mouse? Try the following: >
:function! GetPixel() :function! GetPixel()
: let c = getline(line("."))[col(".") - 1] : let c = getline(".")[col(".") - 1]
: echo c : echo c
: exe "noremap <LeftMouse> <LeftMouse>r".c : exe "noremap <LeftMouse> <LeftMouse>r".c
: exe "noremap <LeftDrag> <LeftMouse>r".c : exe "noremap <LeftDrag> <LeftMouse>r".c

1
runtime/doc/tags
View File

@@ -5611,7 +5611,6 @@ hebrew hebrew.txt /*hebrew*
hebrew.txt hebrew.txt /*hebrew.txt* hebrew.txt hebrew.txt /*hebrew.txt*
help various.txt /*help* help various.txt /*help*
help-context help.txt /*help-context* help-context help.txt /*help-context*
help-tags tags 1
help-translated various.txt /*help-translated* help-translated various.txt /*help-translated*
help-xterm-window various.txt /*help-xterm-window* help-xterm-window various.txt /*help-xterm-window*
help.txt help.txt /*help.txt* help.txt help.txt /*help.txt*

9
runtime/doc/todo.txt
View File

@@ -1,4 +1,4 @@
*todo.txt* For Vim version 7.0c. Last change: 2006 Apr 06 *todo.txt* For Vim version 7.0c. Last change: 2006 Apr 07
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@@ -30,6 +30,13 @@ be worked on, but only if you sponsor Vim development. See |sponsor|.
*known-bugs* *known-bugs*
-------------------- Known bugs and current work ----------------------- -------------------- Known bugs and current work -----------------------
Handle postponed prefix with COMPOUNDPERMITFLAG or COMPOUNDFORBIDFLAG.
WFP_COMPPERMIT and WFP_COMPFORBID
":mkspell" still takes too long in Hungarian dictionary.
Use ~/tmp/hungarian*.txt to test dictionary with.
New Hungarian dictionary. (Laci Nemeth) New Hungarian dictionary. (Laci Nemeth)
- implement use of <compoptions> in .spl file: - implement use of <compoptions> in .spl file:
- implement CHECKCOMPOUNDREP: when a compound word seems to be OK apply REP - implement CHECKCOMPOUNDREP: when a compound word seems to be OK apply REP

19
runtime/doc/version7.txt
View File

@@ -1,4 +1,4 @@
*version7.txt* For Vim version 7.0c. Last change: 2006 Apr 06 *version7.txt* For Vim version 7.0c. Last change: 2006 Apr 07
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@@ -160,6 +160,7 @@ as <line1>. The items can no longer be abbreviated.
When executing a FileChangedRO autocommand it is no longer allowed to switch When executing a FileChangedRO autocommand it is no longer allowed to switch
to another buffer or edit another file. This is to prevent crashes (the event to another buffer or edit another file. This is to prevent crashes (the event
is triggered deep down in the code where changing buffers is not anticipated). is triggered deep down in the code where changing buffers is not anticipated).
It is possible to reload the buffer.
============================================================================== ==============================================================================
NEW FEATURES *new-7* NEW FEATURES *new-7*
@@ -951,6 +952,7 @@ sensors syntax and ftplugin file. (Nikolai Weibull)
services syntax and ftplugin file. (Nikolai Weibull) services syntax and ftplugin file. (Nikolai Weibull)
setserial syntax and ftplugin file. (Nikolai Weibull) setserial syntax and ftplugin file. (Nikolai Weibull)
sieve syntax and ftplugin file. (Nikolai Weibull) sieve syntax and ftplugin file. (Nikolai Weibull)
SiSU syntax file (Ralph Amissah)
Sive syntax file. (Nikolai Weibull) Sive syntax file. (Nikolai Weibull)
slp config, reg and spi syntax and ftplugin files. (Nikolai Weibull) slp config, reg and spi syntax and ftplugin files. (Nikolai Weibull)
SML indent file. (Saikat Guha) SML indent file. (Saikat Guha)
@@ -2394,4 +2396,19 @@ When using the menu in the tab pages line, "New Tab" opens the new tab before
where the click was. Beyond the labels the new tab appears at the end instead where the click was. Beyond the labels the new tab appears at the end instead
of after the current tab page. of after the current tab page.
Inside a mapping with an expression getchar() could not be used.
When vgetc is used recursively vgetc_busy protects it from being used
recursively. But after a ":normal" command the protection was reset.
":s/a/b/n" didn't work when 'modifiable' was off.
When $VIMRUNTIME includes a multi-byte character then rgb.txt could not be
found. (Yukihiro Nakadaira)
":mkspell" didn't work correctly for non-ASCII affix flags when conversion is
needed on the spell file.
glob('/dir/\$ABC/*') didn't work.
vim:tw=78:ts=8:ft=help:norl: vim:tw=78:ts=8:ft=help:norl:

97
runtime/lang/menu_de_de.latin1.vim
View File

@@ -1,7 +1,7 @@
" Menu Translations: German / Deutsch " Menu Translations: German / Deutsch
" Maintainer: Georg Dahn <gorgyd@yahoo.co.uk> " Maintainer: Georg Dahn <gorgyd@yahoo.co.uk>
" Originally By: Marcin Dalecki <dalecki@cs.net.pl> " Originally By: Marcin Dalecki <dalecki@cs.net.pl>
" Johannes Zellner <johannes@zellner.org> " Johannes Zellner <johannes@zellner.org>
" Last Change: Sat, 11 Mar 2006 22:40:00 CEST " Last Change: Sat, 11 Mar 2006 22:40:00 CEST
" vim:set foldmethod=marker tabstop=8: " vim:set foldmethod=marker tabstop=8:
@@ -20,12 +20,12 @@ endif
" {{{ FILE / DATEI " {{{ FILE / DATEI
menutrans &File &Datei menutrans &File &Datei
menutrans &Open\.\.\.<Tab>:e &<26>ffnen\.\.\.<Tab>:e menutrans &Open\.\.\.<Tab>:e &<26>ffnen\.\.\.<Tab>:e
menutrans Sp&lit-Open\.\.\.<Tab>:sp In\ geteiltem\ &Fenster\ <20>ffnen\.\.\.<Tab>:sp menutrans Sp&lit-Open\.\.\.<Tab>:sp In\ geteiltem\ &Fenster\ <20>ffnen\.\.\.<Tab>:sp
menutrans Open\ Tab\.\.\.<Tab>:tabnew In\ neuem\ &Tab\ <20>ffnen\.\.\.<Tab>:tabnew menutrans Open\ Tab\.\.\.<Tab>:tabnew In\ neuem\ &Tab\ <20>ffnen\.\.\.<Tab>:tabnew
menutrans &New<Tab>:enew &Neue\ Datei<Tab>:enew menutrans &New<Tab>:enew &Neue\ Datei<Tab>:enew
menutrans &Close<Tab>:close S&chlie<EFBFBD>en<Tab>:close menutrans &Close<Tab>:close S&chlie<EFBFBD>en<Tab>:close
menutrans &Save<Tab>:w &Speichern<Tab>:w menutrans &Save<Tab>:w &Speichern<Tab>:w
menutrans Save\ &As\.\.\.<Tab>:sav Speichern\ &Als\.\.\.<Tab>:sav menutrans Save\ &As\.\.\.<Tab>:sav Speichern\ &als\.\.\.<Tab>:sav
menutrans &Print &Drucken menutrans &Print &Drucken
menutrans Sa&ve-Exit<Tab>:wqa Speichern\ und\ Be&enden<Tab>:wqa menutrans Sa&ve-Exit<Tab>:wqa Speichern\ und\ Be&enden<Tab>:wqa
menutrans E&xit<Tab>:qa &Beenden<Tab>:qa menutrans E&xit<Tab>:qa &Beenden<Tab>:qa
@@ -44,10 +44,10 @@ menutrans Rep&eat<Tab>\. &Wiederholen<Tab>\.
menutrans Cu&t<Tab>"+x &Ausschneiden<Tab>"+x menutrans Cu&t<Tab>"+x &Ausschneiden<Tab>"+x
menutrans &Copy<Tab>"+y &Kopieren<Tab>"+y menutrans &Copy<Tab>"+y &Kopieren<Tab>"+y
menutrans &Paste<Tab>"+gP Ein&f<>gen<Tab>"+gP menutrans &Paste<Tab>"+gP Ein&f<>gen<Tab>"+gP
menutrans Put\ &Before<Tab>[p Da&vor\ Einf<EFBFBD>gen<Tab>[p menutrans Put\ &Before<Tab>[p Da&vor\ einf<EFBFBD>gen<Tab>[p
menutrans Put\ &After<Tab>]p Da&nach\ Einf<EFBFBD>gen<Tab>]p menutrans Put\ &After<Tab>]p Da&nach\ einf<EFBFBD>gen<Tab>]p
menutrans &Delete<Tab>x &L<EFBFBD>schen<Tab>x menutrans &Delete<Tab>x &L<EFBFBD>schen<Tab>x
menutrans &Select\ All<Tab>ggVG Alles\ &Markieren<Tab>ggVG menutrans &Select\ All<Tab>ggVG Alles\ &markieren<Tab>ggVG
menutrans &Find\.\.\. &Suchen\.\.\. menutrans &Find\.\.\. &Suchen\.\.\.
menutrans Find\ and\ Rep&lace\.\.\. Suchen\ und\ &Ersetzen\.\.\. menutrans Find\ and\ Rep&lace\.\.\. Suchen\ und\ &Ersetzen\.\.\.
@@ -55,6 +55,7 @@ menutrans Find\ and\ Rep&lace\.\.\. Suchen\ und\ &Ersetzen\.\.\.
" XXX &E would conflict with 'Suchen\ und\ &Ersetzen', see above " XXX &E would conflict with 'Suchen\ und\ &Ersetzen', see above
menutrans Settings\ &Window E&instellungen\.\.\. menutrans Settings\ &Window E&instellungen\.\.\.
menutrans &Global\ Settings &Globale\ Einstellungen menutrans &Global\ Settings &Globale\ Einstellungen
menutrans Startup\ &Settings &Starteinstellungen
menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! &Hervorhebungen\ ein-\ und\ ausschalten<Tab>:set\ hls! menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! &Hervorhebungen\ ein-\ und\ ausschalten<Tab>:set\ hls!
menutrans Toggle\ &Ignore-case<Tab>:set\ ic! Gro<EFBFBD>schreibung\ &ignorieren\ oder\ benutzen<Tab>:set\ ic! menutrans Toggle\ &Ignore-case<Tab>:set\ ic! Gro<EFBFBD>schreibung\ &ignorieren\ oder\ benutzen<Tab>:set\ ic!
@@ -66,7 +67,7 @@ menutrans &Virtual\ Edit &Virtueller\ Editier-Modus
menutrans Never Nie menutrans Never Nie
menutrans Block\ Selection Block-Auswahl menutrans Block\ Selection Block-Auswahl
menutrans Insert\ mode Einf<EFBFBD>ge-Modus menutrans Insert\ mode Einf<EFBFBD>ge-Modus
menutrans Block\ and\ Insert Block-\ und\ Einf<EFBFBD>ge-Modus menutrans Block\ and\ Insert Block-Auswahl\ und\ Einf<EFBFBD>ge-Modus
menutrans Always Immer menutrans Always Immer
menutrans Toggle\ Insert\ &Mode<Tab>:set\ im! Einf<EFBFBD>ge-&Modus\ ein-\ und\ ausschalten<Tab>:set\ im! menutrans Toggle\ Insert\ &Mode<Tab>:set\ im! Einf<EFBFBD>ge-&Modus\ ein-\ und\ ausschalten<Tab>:set\ im!
menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp! Vi-Kompatibilit<EFBFBD>t\ ein-\ und\ ausschalten<Tab>:set\ cp! menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp! Vi-Kompatibilit<EFBFBD>t\ ein-\ und\ ausschalten<Tab>:set\ cp!
@@ -94,19 +95,19 @@ menutrans Toggle\ &C-indenting<Tab>:set\ cin! &C-Einr
" other options " other options
menutrans &Shiftwidth &Schiebeweite menutrans &Shiftwidth &Schiebeweite
menutrans Soft\ &Tabstop &Tabulator menutrans Soft\ &Tabstop &Tabulator
menutrans Te&xt\ Width\.\.\. Te&xt\ Breite\.\.\. menutrans Te&xt\ Width\.\.\. Te&xtbreite\.\.\.
menutrans &File\ Format\.\.\. &Datei\ Format\.\.\. menutrans &File\ Format\.\.\. &Dateiformat\.\.\.
menutrans C&olor\ Scheme F&arbschema\.\.\. menutrans C&olor\ Scheme F&arbschema\.\.\.
menutrans &Keymap &Tastatur-Belegung menutrans &Keymap &Tastaturbelegung
" }}} EDIT / EDITIEREN " }}} EDIT / EDITIEREN
" {{{ TOOLS / WERKZEUGE " {{{ TOOLS / WERKZEUGE
if has("spell") if has("spell")
menutrans &Spelling &Rechtschreibung menutrans &Spelling &Rechtschreibung
menutrans &Spell\ Check\ On &Rechtschreibpr<EFBFBD>fung\ An menutrans &Spell\ Check\ On &Rechtschreibpr<EFBFBD>fung\ an
menutrans Spell\ Check\ &Off Rechtschreibpr<EFBFBD>fung\ &Aus menutrans Spell\ Check\ &Off Rechtschreibpr<EFBFBD>fung\ &aus
menutrans To\ &Next\ error<Tab>]s Zum\ &N<EFBFBD>chsten\ Fehler<Tab>]s menutrans To\ &Next\ error<Tab>]s Zum\ &n<EFBFBD>chsten\ Fehler<Tab>]s
menutrans To\ &Previous\ error<Tab>[s Zum\ &Letzten\ Fehler<Tab>[s menutrans To\ &Previous\ error<Tab>[s Zum\ &vorherigen\ Fehler<Tab>[s
menutrans Suggest\ &Corrections<Tab>z= &Korrekturvorschl<EFBFBD>ge<Tab>z= menutrans Suggest\ &Corrections<Tab>z= &Korrekturvorschl<EFBFBD>ge<Tab>z=
menutrans &Repeat\ correction<Tab>:spellrepall &Wiederhole\ Korrektur<Tab>:spellrepall menutrans &Repeat\ correction<Tab>:spellrepall &Wiederhole\ Korrektur<Tab>:spellrepall
menutrans Set\ language\ to\ "en" Verwende\ W<EFBFBD>rterbuch\ "en" menutrans Set\ language\ to\ "en" Verwende\ W<EFBFBD>rterbuch\ "en"
@@ -115,7 +116,7 @@ if has("spell")
menutrans Set\ language\ to\ "en_gb" Verwende\ W<EFBFBD>rterbuch\ "en_gb" menutrans Set\ language\ to\ "en_gb" Verwende\ W<EFBFBD>rterbuch\ "en_gb"
menutrans Set\ language\ to\ "en_nz" Verwende\ W<EFBFBD>rterbuch\ "en_nz" menutrans Set\ language\ to\ "en_nz" Verwende\ W<EFBFBD>rterbuch\ "en_nz"
menutrans Set\ language\ to\ "en_us" Verwende\ W<EFBFBD>rterbuch\ "en_us" menutrans Set\ language\ to\ "en_us" Verwende\ W<EFBFBD>rterbuch\ "en_us"
menutrans Set\ language\ to\ "de" Verwende\ W<EFBFBD>rterbuch\ "de" menutrans Set\ language\ to\ "de" Verwende\ W<EFBFBD>rterbuch\ "de"
menutrans &Find\ More\ Languages &Suche\ nach\ W<EFBFBD>rterb<EFBFBD>chern menutrans &Find\ More\ Languages &Suche\ nach\ W<EFBFBD>rterb<EFBFBD>chern
endif endif
if has("folding") if has("folding")
@@ -138,29 +139,29 @@ if has("folding")
menutrans Ma&rker Ma&rkierungen menutrans Ma&rker Ma&rkierungen
" create and delete folds " create and delete folds
" TODO accelerators " TODO accelerators
menutrans Create\ &Fold<Tab>zf Faltung\ Erzeugen<Tab>zf menutrans Create\ &Fold<Tab>zf Faltung\ erzeugen<Tab>zf
menutrans &Delete\ Fold<Tab>zd Faltung\ L<EFBFBD>schen<Tab>zd menutrans &Delete\ Fold<Tab>zd Faltung\ l<EFBFBD>schen<Tab>zd
menutrans Delete\ &All\ Folds<Tab>zD Alle\ Faltungen\ L<EFBFBD>schen<Tab>zD menutrans Delete\ &All\ Folds<Tab>zD Alle\ Faltungen\ l<EFBFBD>schen<Tab>zD
" moving around in folds " moving around in folds
menutrans Fold\ column\ &width &Breite\ der\ Faltungs-Spalte menutrans Fold\ column\ &width &Breite\ der\ Faltungsspalte
endif " has folding endif " has folding
if has("diff") if has("diff")
menutrans &Diff &Differenz menutrans &Diff &Differenz
menutrans &Update &Aktualisieren menutrans &Update &Aktualisieren
menutrans &Get\ Block Block\ &Einf<EFBFBD>gen menutrans &Get\ Block Block\ &einf<EFBFBD>gen
menutrans &Put\ Block Block\ &<26>bertragen menutrans &Put\ Block Block\ &<26>bertragen
endif endif
menutrans &Tools &Werkzeuge menutrans &Tools &Werkzeuge
menutrans &Jump\ to\ this\ tag<Tab>g^] &Springe\ zum\ Tag<Tab>g^] menutrans &Jump\ to\ this\ tag<Tab>g^] &Springe\ zum\ Tag<Tab>g^]
menutrans Jump\ &back<Tab>^T Springe\ &Zur<EFBFBD>ck<Tab>^T menutrans Jump\ &back<Tab>^T Springe\ &zur<EFBFBD>ck<Tab>^T
menutrans Build\ &Tags\ File Erstelle\ &Tags\ Datei menutrans Build\ &Tags\ File Erstelle\ &Tag-Datei
menutrans &Make<Tab>:make &Erstellen<Tab>:make menutrans &Make<Tab>:make &Erstellen<Tab>:make
menutrans &List\ Errors<Tab>:cl &Fehler\ Anzeigen<Tab>:cl menutrans &List\ Errors<Tab>:cl &Fehler\ anzeigen<Tab>:cl
menutrans L&ist\ Messages<Tab>:cl! &Hinweise\ Anzeigen<Tab>:cl! menutrans L&ist\ Messages<Tab>:cl! &Hinweise\ anzeigen<Tab>:cl!
menutrans &Next\ Error<Tab>:cn Zum\ &N<EFBFBD>chsten\ Fehler<Tab>:cn menutrans &Next\ Error<Tab>:cn Zum\ &n<EFBFBD>chsten\ Fehler<Tab>:cn
menutrans &Previous\ Error<Tab>:cp Zum\ &Vorherigen\ Fehler<Tab>:cp menutrans &Previous\ Error<Tab>:cp Zum\ &vorherigen\ Fehler<Tab>:cp
menutrans &Older\ List<Tab>:cold &<26>ltere\ Liste<Tab>:cold menutrans &Older\ List<Tab>:cold &<26>ltere\ Liste<Tab>:cold
menutrans N&ewer\ List<Tab>:cnew &Neuere\ Liste<Tab>:cnew menutrans N&ewer\ List<Tab>:cnew &Neuere\ Liste<Tab>:cnew
@@ -178,8 +179,8 @@ menutrans Conve&rt\ back<Tab>:%!xxd\ -r Zur
" {{{ SYNTAX / SYNTAX " {{{ SYNTAX / SYNTAX
menutrans &Syntax &Syntax menutrans &Syntax &Syntax
menutrans &Show\ filetypes\ in\ menu Dateitypen\ an&zeigen menutrans &Show\ filetypes\ in\ menu Dateitypen\ an&zeigen
menutrans Set\ '&syntax'\ only Nur\ '&syntax'\ Setzen menutrans Set\ '&syntax'\ only Nur\ '&syntax'\ setzen
menutrans Set\ '&filetype'\ too Auch\ '&filetype'\ Setzen menutrans Set\ '&filetype'\ too Auch\ '&filetype'\ setzen
menutrans &Off &Aus menutrans &Off &Aus
menutrans &Manual &Manuell menutrans &Manual &Manuell
menutrans A&utomatic A&utomatisch menutrans A&utomatic A&utomatisch
@@ -202,11 +203,11 @@ menutrans &Previous &Vorheriger
menutrans &Window &Ansicht menutrans &Window &Ansicht
menutrans &New<Tab>^Wn &Neu<Tab>^Wn menutrans &New<Tab>^Wn &Neu<Tab>^Wn
menutrans S&plit<Tab>^Ws Aufs&palten<Tab>^Ws menutrans S&plit<Tab>^Ws Aufs&palten<Tab>^Ws
menutrans Split\ &Vertically<Tab>^Wv &Vertikal\ Aufspalten<Tab>^Wv menutrans Split\ &Vertically<Tab>^Wv &Vertikal\ aufspalten<Tab>^Wv
menutrans Split\ File\ E&xplorer Ver&zeichnis menutrans Split\ File\ E&xplorer Ver&zeichnis
menutrans Sp&lit\ To\ #<Tab>^W^^ Aufspa&lten\ in\ #<Tab>^W^^ menutrans Sp&lit\ To\ #<Tab>^W^^ Aufspa&lten\ in\ #<Tab>^W^^
menutrans &Close<Tab>^Wc &Schlie<EFBFBD>en<Tab>^Wc menutrans &Close<Tab>^Wc &Schlie<EFBFBD>en<Tab>^Wc
menutrans Close\ &Other(s)<Tab>^Wo &Andere\ Schlie<EFBFBD>en<Tab>^Wo menutrans Close\ &Other(s)<Tab>^Wo &Andere\ schlie<EFBFBD>en<Tab>^Wo
menutrans Ne&xt<Tab>^Ww N&<26>chstes<Tab>^Ww menutrans Ne&xt<Tab>^Ww N&<26>chstes<Tab>^Ww
menutrans P&revious<Tab>^WW Vor&heriges<Tab>^WW menutrans P&revious<Tab>^WW Vor&heriges<Tab>^WW
menutrans &Equal\ Size<Tab>^W= &Gleiche\ H<EFBFBD>hen<Tab>^W= menutrans &Equal\ Size<Tab>^W= &Gleiche\ H<EFBFBD>hen<Tab>^W=
@@ -259,9 +260,9 @@ if has("toolbar")
delfun Do_toolbar_tmenu delfun Do_toolbar_tmenu
endif endif
fun Do_toolbar_tmenu() fun Do_toolbar_tmenu()
tmenu ToolBar.Open Datei <20>ffnen tmenu ToolBar.Open Datei <20>ffnen
tmenu ToolBar.Save Datei Speichern tmenu ToolBar.Save Datei speichern
tmenu ToolBar.SaveAll Alle Dateien Speichern tmenu ToolBar.SaveAll Alle Dateien speichern
tmenu ToolBar.Print Drucken tmenu ToolBar.Print Drucken
tmenu ToolBar.Undo Zur<EFBFBD>ck tmenu ToolBar.Undo Zur<EFBFBD>ck
tmenu ToolBar.Redo Wiederholen tmenu ToolBar.Redo Wiederholen
@@ -269,25 +270,25 @@ if has("toolbar")
tmenu ToolBar.Copy Kopieren tmenu ToolBar.Copy Kopieren
tmenu ToolBar.Paste Einf<EFBFBD>gen tmenu ToolBar.Paste Einf<EFBFBD>gen
tmenu ToolBar.Find Suchen... tmenu ToolBar.Find Suchen...
tmenu ToolBar.FindNext Suche N<EFBFBD>chsten tmenu ToolBar.FindNext Suche n<EFBFBD>chsten
tmenu ToolBar.FindPrev Suche Vorherigen tmenu ToolBar.FindPrev Suche vorherigen
tmenu ToolBar.Replace Suchen und Ersetzen... tmenu ToolBar.Replace Suchen und Ersetzen...
if 0 " disabled; These are in the Windows menu if 0 " disabled; These are in the Windows menu
tmenu ToolBar.New Neue Ansicht tmenu ToolBar.New Neue Ansicht
tmenu ToolBar.WinSplit Ansicht Aufspalten tmenu ToolBar.WinSplit Ansicht aufspalten
tmenu ToolBar.WinMax Ansicht Maximale H<EFBFBD>hen tmenu ToolBar.WinMax Ansicht maximale H<EFBFBD>hen
tmenu ToolBar.WinMin Ansicht Minimale H<EFBFBD>hen tmenu ToolBar.WinMin Ansicht minimale H<EFBFBD>hen
tmenu ToolBar.WinClose Ansicht Schlie<EFBFBD>en tmenu ToolBar.WinClose Ansicht schlie<EFBFBD>en
endif endif
tmenu ToolBar.LoadSesn Sitzung Laden tmenu ToolBar.LoadSesn Sitzung laden
tmenu ToolBar.SaveSesn Sitzung Speichern tmenu ToolBar.SaveSesn Sitzung speichern
tmenu ToolBar.RunScript Vim-Skript Ausf<EFBFBD>hren tmenu ToolBar.RunScript Vim-Skript ausf<EFBFBD>hren
tmenu ToolBar.Make Erstellen tmenu ToolBar.Make Erstellen
tmenu ToolBar.Shell Shell Starten tmenu ToolBar.Shell Shell starten
tmenu ToolBar.RunCtags Erstelle Tags Datei tmenu ToolBar.RunCtags Erstelle Tag-Datei
tmenu ToolBar.TagJump Springe zum Tag tmenu ToolBar.TagJump Springe zum Tag
tmenu ToolBar.Help Hilfe! tmenu ToolBar.Help Hilfe!
tmenu ToolBar.FindHelp Hilfe Durchsuchen... tmenu ToolBar.FindHelp Hilfe durchsuchen...
endfun endfun
endif endif
" }}} TOOLBAR " }}} TOOLBAR

7
src/ex_cmds.c
View File

@@ -4287,6 +4287,13 @@ do_sub(eap)
if (eap->skip) /* not executing commands, only parsing */ if (eap->skip) /* not executing commands, only parsing */
return; return;
if (!do_count && !curbuf->b_p_ma)
{
/* Substitusion is not allowed in non-'modifiable' buffer */
EMSG(_(e_modifiable));
return;
}
if (search_regcomp(pat, RE_SUBST, which_pat, SEARCH_HIS, &regmatch) == FAIL) if (search_regcomp(pat, RE_SUBST, which_pat, SEARCH_HIS, &regmatch) == FAIL)
{ {
if (do_error) if (do_error)

6
src/ex_cmds.h
View File

@@ -768,7 +768,7 @@ EX(CMD_rubyfile, "rubyfile", ex_rubyfile,
EX(CMD_rviminfo, "rviminfo", ex_viminfo, EX(CMD_rviminfo, "rviminfo", ex_viminfo,
BANG|FILE1|TRLBAR|CMDWIN), BANG|FILE1|TRLBAR|CMDWIN),
EX(CMD_substitute, "substitute", do_sub, EX(CMD_substitute, "substitute", do_sub,
RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY), RANGE|WHOLEFOLD|EXTRA|CMDWIN),
EX(CMD_sNext, "sNext", ex_previous, EX(CMD_sNext, "sNext", ex_previous,
EXTRA|RANGE|NOTADR|COUNT|BANG|EDITCMD|ARGOPT|TRLBAR), EXTRA|RANGE|NOTADR|COUNT|BANG|EDITCMD|ARGOPT|TRLBAR),
EX(CMD_sargument, "sargument", ex_argument, EX(CMD_sargument, "sargument", ex_argument,
@@ -828,7 +828,7 @@ EX(CMD_sleep, "sleep", ex_sleep,
EX(CMD_slast, "slast", ex_last, EX(CMD_slast, "slast", ex_last,
EXTRA|BANG|EDITCMD|ARGOPT|TRLBAR), EXTRA|BANG|EDITCMD|ARGOPT|TRLBAR),
EX(CMD_smagic, "smagic", ex_submagic, EX(CMD_smagic, "smagic", ex_submagic,
RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY), RANGE|WHOLEFOLD|EXTRA|CMDWIN),
EX(CMD_smap, "smap", ex_map, EX(CMD_smap, "smap", ex_map,
EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN), EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
EX(CMD_smapclear, "smapclear", ex_mapclear, EX(CMD_smapclear, "smapclear", ex_mapclear,
@@ -840,7 +840,7 @@ EX(CMD_snext, "snext", ex_next,
EX(CMD_sniff, "sniff", ex_sniff, EX(CMD_sniff, "sniff", ex_sniff,
EXTRA|TRLBAR), EXTRA|TRLBAR),
EX(CMD_snomagic, "snomagic", ex_submagic, EX(CMD_snomagic, "snomagic", ex_submagic,
RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY), RANGE|WHOLEFOLD|EXTRA|CMDWIN),
EX(CMD_snoremap, "snoremap", ex_map, EX(CMD_snoremap, "snoremap", ex_map,
EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN), EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
EX(CMD_snoremenu, "snoremenu", ex_menu, EX(CMD_snoremenu, "snoremenu", ex_menu,

16
src/ex_cmds2.c
View File

@@ -1488,7 +1488,7 @@ check_changed_any(hidden)
* may cause a redraw. But wait_return() is a no-op when vgetc() * may cause a redraw. But wait_return() is a no-op when vgetc()
* is busy (Quit used from window menu), then make sure we don't * is busy (Quit used from window menu), then make sure we don't
* cause a scroll up. */ * cause a scroll up. */
if (vgetc_busy) if (vgetc_busy > 0)
{ {
msg_row = cmdline_row; msg_row = cmdline_row;
msg_col = 0; msg_col = 0;
@@ -3696,20 +3696,20 @@ get_locale_val(what)
* redefined and it doesn't use the arguments. */ * redefined and it doesn't use the arguments. */
loc = setlocale(what, NULL); loc = setlocale(what, NULL);
# if defined(__BORLANDC__) # ifdef WIN32
if (loc != NULL) if (loc != NULL)
{ {
char_u *p; char_u *p;
/* Borland returns something like "LC_CTYPE=<name>\n" /* setocale() returns something like "LC_COLLATE=<name>;LC_..." when
* Let's try to fix that bug here... */ * one of the values (e.g., LC_CTYPE) differs. */
p = vim_strchr(loc, '='); p = vim_strchr(loc, '=');
if (p != NULL) if (p != NULL)
{ {
loc = ++p; loc = ++p;
while (*p != NUL) /* remove trailing newline */ while (*p != NUL) /* remove trailing newline */
{ {
if (*p < ' ') if (*p < ' ' || *p == ';')
{ {
*p = NUL; *p = NUL;
break; break;
@@ -3778,8 +3778,10 @@ get_mess_lang()
p = (char_u *)get_locale_val(LC_MESSAGES); p = (char_u *)get_locale_val(LC_MESSAGES);
# else # else
/* This is necessary for Win32, where LC_MESSAGES is not defined and $LANG /* This is necessary for Win32, where LC_MESSAGES is not defined and $LANG
* may be set to the LCID number. */ * may be set to the LCID number. LC_COLLATE is the best guess, LC_TIME
p = (char_u *)get_locale_val(LC_ALL); * and LC_MONETARY may be set differently for a Japanese working in the
* US. */
p = (char_u *)get_locale_val(LC_COLLATE);
# endif # endif
# else # else
p = mch_getenv((char_u *)"LC_ALL"); p = mch_getenv((char_u *)"LC_ALL");

2
src/hardcopy.c
View File

@@ -2474,7 +2474,7 @@ mch_print_init(psettings, jobname, forceit)
double bottom; double bottom;
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
int props; int props;
int cmap; int cmap = 0;
char_u *p_encoding; char_u *p_encoding;
struct prt_ps_encoding_S *p_mbenc; struct prt_ps_encoding_S *p_mbenc;
struct prt_ps_encoding_S *p_mbenc_first; struct prt_ps_encoding_S *p_mbenc_first;

6
src/version.h
View File

@@ -35,6 +35,6 @@
*/ */
#define VIM_VERSION_NODOT "vim70c" #define VIM_VERSION_NODOT "vim70c"
#define VIM_VERSION_SHORT "7.0c" #define VIM_VERSION_SHORT "7.0c"
#define VIM_VERSION_MEDIUM "7.0c11 BETA" #define VIM_VERSION_MEDIUM "7.0c12 BETA"
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0c11 BETA (2006 Apr 6)" #define VIM_VERSION_LONG "VIM - Vi IMproved 7.0c12 BETA (2006 Apr 7)"
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0c11 BETA (2006 Apr 6, compiled " #define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0c12 BETA (2006 Apr 7, compiled "