Mirror of the Vim source from https://github.com/vim/vim
リビジョン | 9ab23f1e137fd5b0e35c1604ffb95979713f83e4 (tree) |
---|---|
日時 | 2006-04-08 06:40:07 |
作者 | vimboss |
コミッター | vimboss |
updated for version 7.0c12
@@ -1,4 +1,4 @@ | ||
1 | -*autocmd.txt* For Vim version 7.0c. Last change: 2006 Apr 04 | |
1 | +*autocmd.txt* For Vim version 7.0c. Last change: 2006 Apr 07 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -506,8 +506,8 @@ | ||
506 | 506 | the change was caused by an autocommand. |
507 | 507 | This event is triggered when making the first |
508 | 508 | change in a buffer or the first change after |
509 | - 'readonly' was set, | |
510 | - just before the change is applied to the text. | |
509 | + 'readonly' was set, just before the change is | |
510 | + applied to the text. | |
511 | 511 | WARNING: If the autocommand moves the cursor |
512 | 512 | the effect of the change is undefined. |
513 | 513 | *E788* |
@@ -1,4 +1,4 @@ | ||
1 | -*eval.txt* For Vim version 7.0c. Last change: 2006 Apr 04 | |
1 | +*eval.txt* For Vim version 7.0c. Last change: 2006 Apr 06 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -819,7 +819,7 @@ | ||
819 | 819 | Index zero gives the first character. This is like it works in C. Careful: |
820 | 820 | text column numbers start with one! Example, to get the character under the |
821 | 821 | cursor: > |
822 | - :let c = getline(line("."))[col(".") - 1] | |
822 | + :let c = getline(".")[col(".") - 1] | |
823 | 823 | |
824 | 824 | If the length of the String is less than the index, the result is an empty |
825 | 825 | String. A negative index always results in an empty string (reason: backwards |
@@ -4562,7 +4562,7 @@ | ||
4562 | 4562 | strpart("abcdefg", 3) == "defg" |
4563 | 4563 | < Note: To get the first character, {start} must be 0. For |
4564 | 4564 | example, to get three bytes under and after the cursor: > |
4565 | - strpart(getline(line(".")), col(".") - 1, 3) | |
4565 | + strpart(getline("."), col(".") - 1, 3) | |
4566 | 4566 | < |
4567 | 4567 | strridx({haystack}, {needle} [, {start}]) *strridx()* |
4568 | 4568 | The result is a Number, which gives the byte index in |
@@ -1,4 +1,4 @@ | ||
1 | -*syntax.txt* For Vim version 7.0c. Last change: 2006 Apr 04 | |
1 | +*syntax.txt* For Vim version 7.0c. Last change: 2006 Apr 06 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -2581,7 +2581,7 @@ | ||
2581 | 2581 | |
2582 | 2582 | Do you want to draw with the mouse? Try the following: > |
2583 | 2583 | :function! GetPixel() |
2584 | - : let c = getline(line("."))[col(".") - 1] | |
2584 | + : let c = getline(".")[col(".") - 1] | |
2585 | 2585 | : echo c |
2586 | 2586 | : exe "noremap <LeftMouse> <LeftMouse>r".c |
2587 | 2587 | : exe "noremap <LeftDrag> <LeftMouse>r".c |
@@ -5611,7 +5611,6 @@ | ||
5611 | 5611 | hebrew.txt hebrew.txt /*hebrew.txt* |
5612 | 5612 | help various.txt /*help* |
5613 | 5613 | help-context help.txt /*help-context* |
5614 | -help-tags tags 1 | |
5615 | 5614 | help-translated various.txt /*help-translated* |
5616 | 5615 | help-xterm-window various.txt /*help-xterm-window* |
5617 | 5616 | help.txt help.txt /*help.txt* |
@@ -1,4 +1,4 @@ | ||
1 | -*todo.txt* For Vim version 7.0c. Last change: 2006 Apr 06 | |
1 | +*todo.txt* For Vim version 7.0c. Last change: 2006 Apr 07 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -30,6 +30,13 @@ | ||
30 | 30 | *known-bugs* |
31 | 31 | -------------------- Known bugs and current work ----------------------- |
32 | 32 | |
33 | +Handle postponed prefix with COMPOUNDPERMITFLAG or COMPOUNDFORBIDFLAG. | |
34 | + WFP_COMPPERMIT and WFP_COMPFORBID | |
35 | + | |
36 | +":mkspell" still takes too long in Hungarian dictionary. | |
37 | + | |
38 | +Use ~/tmp/hungarian*.txt to test dictionary with. | |
39 | + | |
33 | 40 | New Hungarian dictionary. (Laci Nemeth) |
34 | 41 | - implement use of <compoptions> in .spl file: |
35 | 42 | - implement CHECKCOMPOUNDREP: when a compound word seems to be OK apply REP |
@@ -1,4 +1,4 @@ | ||
1 | -*version7.txt* For Vim version 7.0c. Last change: 2006 Apr 06 | |
1 | +*version7.txt* For Vim version 7.0c. Last change: 2006 Apr 07 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -160,6 +160,7 @@ | ||
160 | 160 | When executing a FileChangedRO autocommand it is no longer allowed to switch |
161 | 161 | to another buffer or edit another file. This is to prevent crashes (the event |
162 | 162 | is triggered deep down in the code where changing buffers is not anticipated). |
163 | +It is possible to reload the buffer. | |
163 | 164 | |
164 | 165 | ============================================================================== |
165 | 166 | NEW FEATURES *new-7* |
@@ -951,6 +952,7 @@ | ||
951 | 952 | services syntax and ftplugin file. (Nikolai Weibull) |
952 | 953 | setserial syntax and ftplugin file. (Nikolai Weibull) |
953 | 954 | sieve syntax and ftplugin file. (Nikolai Weibull) |
955 | +SiSU syntax file (Ralph Amissah) | |
954 | 956 | Sive syntax file. (Nikolai Weibull) |
955 | 957 | slp config, reg and spi syntax and ftplugin files. (Nikolai Weibull) |
956 | 958 | SML indent file. (Saikat Guha) |
@@ -2394,4 +2396,19 @@ | ||
2394 | 2396 | where the click was. Beyond the labels the new tab appears at the end instead |
2395 | 2397 | of after the current tab page. |
2396 | 2398 | |
2399 | +Inside a mapping with an expression getchar() could not be used. | |
2400 | + | |
2401 | +When vgetc is used recursively vgetc_busy protects it from being used | |
2402 | +recursively. But after a ":normal" command the protection was reset. | |
2403 | + | |
2404 | +":s/a/b/n" didn't work when 'modifiable' was off. | |
2405 | + | |
2406 | +When $VIMRUNTIME includes a multi-byte character then rgb.txt could not be | |
2407 | +found. (Yukihiro Nakadaira) | |
2408 | + | |
2409 | +":mkspell" didn't work correctly for non-ASCII affix flags when conversion is | |
2410 | +needed on the spell file. | |
2411 | + | |
2412 | +glob('/dir/\$ABC/*') didn't work. | |
2413 | + | |
2397 | 2414 | vim:tw=78:ts=8:ft=help:norl: |
@@ -1,7 +1,7 @@ | ||
1 | 1 | " Menu Translations: German / Deutsch |
2 | 2 | " Maintainer: Georg Dahn <gorgyd@yahoo.co.uk> |
3 | 3 | " Originally By: Marcin Dalecki <dalecki@cs.net.pl> |
4 | -" Johannes Zellner <johannes@zellner.org> | |
4 | +" Johannes Zellner <johannes@zellner.org> | |
5 | 5 | " Last Change: Sat, 11 Mar 2006 22:40:00 CEST |
6 | 6 | " vim:set foldmethod=marker tabstop=8: |
7 | 7 |
@@ -20,12 +20,12 @@ | ||
20 | 20 | " {{{ FILE / DATEI |
21 | 21 | menutrans &File &Datei |
22 | 22 | menutrans &Open\.\.\.<Tab>:e &Öffnen\.\.\.<Tab>:e |
23 | -menutrans Sp&lit-Open\.\.\.<Tab>:sp In\ geteiltem\ &Fenster\ Öffnen\.\.\.<Tab>:sp | |
24 | -menutrans Open\ Tab\.\.\.<Tab>:tabnew In\ neuem\ &Tab\ Öffnen\.\.\.<Tab>:tabnew | |
23 | +menutrans Sp&lit-Open\.\.\.<Tab>:sp In\ geteiltem\ &Fenster\ öffnen\.\.\.<Tab>:sp | |
24 | +menutrans Open\ Tab\.\.\.<Tab>:tabnew In\ neuem\ &Tab\ öffnen\.\.\.<Tab>:tabnew | |
25 | 25 | menutrans &New<Tab>:enew &Neue\ Datei<Tab>:enew |
26 | 26 | menutrans &Close<Tab>:close S&chließen<Tab>:close |
27 | 27 | menutrans &Save<Tab>:w &Speichern<Tab>:w |
28 | -menutrans Save\ &As\.\.\.<Tab>:sav Speichern\ &Als\.\.\.<Tab>:sav | |
28 | +menutrans Save\ &As\.\.\.<Tab>:sav Speichern\ &als\.\.\.<Tab>:sav | |
29 | 29 | menutrans &Print &Drucken |
30 | 30 | menutrans Sa&ve-Exit<Tab>:wqa Speichern\ und\ Be&enden<Tab>:wqa |
31 | 31 | menutrans E&xit<Tab>:qa &Beenden<Tab>:qa |
@@ -44,10 +44,10 @@ | ||
44 | 44 | menutrans Cu&t<Tab>"+x &Ausschneiden<Tab>"+x |
45 | 45 | menutrans &Copy<Tab>"+y &Kopieren<Tab>"+y |
46 | 46 | menutrans &Paste<Tab>"+gP Ein&fügen<Tab>"+gP |
47 | -menutrans Put\ &Before<Tab>[p Da&vor\ Einfügen<Tab>[p | |
48 | -menutrans Put\ &After<Tab>]p Da&nach\ Einfügen<Tab>]p | |
49 | -menutrans &Delete<Tab>x &Löschen<Tab>x | |
50 | -menutrans &Select\ All<Tab>ggVG Alles\ &Markieren<Tab>ggVG | |
47 | +menutrans Put\ &Before<Tab>[p Da&vor\ einfügen<Tab>[p | |
48 | +menutrans Put\ &After<Tab>]p Da&nach\ einfügen<Tab>]p | |
49 | +menutrans &Delete<Tab>x &Löschen<Tab>x | |
50 | +menutrans &Select\ All<Tab>ggVG Alles\ &markieren<Tab>ggVG | |
51 | 51 | menutrans &Find\.\.\. &Suchen\.\.\. |
52 | 52 | menutrans Find\ and\ Rep&lace\.\.\. Suchen\ und\ &Ersetzen\.\.\. |
53 | 53 |
@@ -55,6 +55,7 @@ | ||
55 | 55 | " XXX &E would conflict with 'Suchen\ und\ &Ersetzen', see above |
56 | 56 | menutrans Settings\ &Window E&instellungen\.\.\. |
57 | 57 | menutrans &Global\ Settings &Globale\ Einstellungen |
58 | +menutrans Startup\ &Settings &Starteinstellungen | |
58 | 59 | |
59 | 60 | menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! &Hervorhebungen\ ein-\ und\ ausschalten<Tab>:set\ hls! |
60 | 61 | menutrans Toggle\ &Ignore-case<Tab>:set\ ic! Großschreibung\ &ignorieren\ oder\ benutzen<Tab>:set\ ic! |
@@ -66,7 +67,7 @@ | ||
66 | 67 | menutrans Never Nie |
67 | 68 | menutrans Block\ Selection Block-Auswahl |
68 | 69 | menutrans Insert\ mode Einfüge-Modus |
69 | -menutrans Block\ and\ Insert Block-\ und\ Einfüge-Modus | |
70 | +menutrans Block\ and\ Insert Block-Auswahl\ und\ Einfüge-Modus | |
70 | 71 | menutrans Always Immer |
71 | 72 | menutrans Toggle\ Insert\ &Mode<Tab>:set\ im! Einfüge-&Modus\ ein-\ und\ ausschalten<Tab>:set\ im! |
72 | 73 | menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp! Vi-Kompatibilität\ ein-\ und\ ausschalten<Tab>:set\ cp! |
@@ -94,19 +95,19 @@ | ||
94 | 95 | " other options |
95 | 96 | menutrans &Shiftwidth &Schiebeweite |
96 | 97 | menutrans Soft\ &Tabstop &Tabulator |
97 | -menutrans Te&xt\ Width\.\.\. Te&xt\ Breite\.\.\. | |
98 | -menutrans &File\ Format\.\.\. &Datei\ Format\.\.\. | |
98 | +menutrans Te&xt\ Width\.\.\. Te&xtbreite\.\.\. | |
99 | +menutrans &File\ Format\.\.\. &Dateiformat\.\.\. | |
99 | 100 | menutrans C&olor\ Scheme F&arbschema\.\.\. |
100 | -menutrans &Keymap &Tastatur-Belegung | |
101 | +menutrans &Keymap &Tastaturbelegung | |
101 | 102 | " }}} EDIT / EDITIEREN |
102 | 103 | |
103 | 104 | " {{{ TOOLS / WERKZEUGE |
104 | 105 | if has("spell") |
105 | 106 | menutrans &Spelling &Rechtschreibung |
106 | - menutrans &Spell\ Check\ On &Rechtschreibprüfung\ An | |
107 | - menutrans Spell\ Check\ &Off Rechtschreibprüfung\ &Aus | |
108 | - menutrans To\ &Next\ error<Tab>]s Zum\ &Nächsten\ Fehler<Tab>]s | |
109 | - menutrans To\ &Previous\ error<Tab>[s Zum\ &Letzten\ Fehler<Tab>[s | |
107 | + menutrans &Spell\ Check\ On &Rechtschreibprüfung\ an | |
108 | + menutrans Spell\ Check\ &Off Rechtschreibprüfung\ &aus | |
109 | + menutrans To\ &Next\ error<Tab>]s Zum\ &nächsten\ Fehler<Tab>]s | |
110 | + menutrans To\ &Previous\ error<Tab>[s Zum\ &vorherigen\ Fehler<Tab>[s | |
110 | 111 | menutrans Suggest\ &Corrections<Tab>z= &Korrekturvorschläge<Tab>z= |
111 | 112 | menutrans &Repeat\ correction<Tab>:spellrepall &Wiederhole\ Korrektur<Tab>:spellrepall |
112 | 113 | menutrans Set\ language\ to\ "en" Verwende\ Wörterbuch\ "en" |
@@ -115,7 +116,7 @@ | ||
115 | 116 | menutrans Set\ language\ to\ "en_gb" Verwende\ Wörterbuch\ "en_gb" |
116 | 117 | menutrans Set\ language\ to\ "en_nz" Verwende\ Wörterbuch\ "en_nz" |
117 | 118 | menutrans Set\ language\ to\ "en_us" Verwende\ Wörterbuch\ "en_us" |
118 | - menutrans Set\ language\ to\ "de" Verwende\ Wörterbuch\ "de" | |
119 | + menutrans Set\ language\ to\ "de" Verwende\ Wörterbuch\ "de" | |
119 | 120 | menutrans &Find\ More\ Languages &Suche\ nach\ Wörterbüchern |
120 | 121 | endif |
121 | 122 | if has("folding") |
@@ -138,29 +139,29 @@ | ||
138 | 139 | menutrans Ma&rker Ma&rkierungen |
139 | 140 | " create and delete folds |
140 | 141 | " TODO accelerators |
141 | - menutrans Create\ &Fold<Tab>zf Faltung\ Erzeugen<Tab>zf | |
142 | - menutrans &Delete\ Fold<Tab>zd Faltung\ Löschen<Tab>zd | |
143 | - menutrans Delete\ &All\ Folds<Tab>zD Alle\ Faltungen\ Löschen<Tab>zD | |
142 | + menutrans Create\ &Fold<Tab>zf Faltung\ erzeugen<Tab>zf | |
143 | + menutrans &Delete\ Fold<Tab>zd Faltung\ löschen<Tab>zd | |
144 | + menutrans Delete\ &All\ Folds<Tab>zD Alle\ Faltungen\ löschen<Tab>zD | |
144 | 145 | " moving around in folds |
145 | - menutrans Fold\ column\ &width &Breite\ der\ Faltungs-Spalte | |
146 | + menutrans Fold\ column\ &width &Breite\ der\ Faltungsspalte | |
146 | 147 | endif " has folding |
147 | 148 | |
148 | 149 | if has("diff") |
149 | 150 | menutrans &Diff &Differenz |
150 | 151 | menutrans &Update &Aktualisieren |
151 | - menutrans &Get\ Block Block\ &Einfügen | |
152 | - menutrans &Put\ Block Block\ &Übertragen | |
152 | + menutrans &Get\ Block Block\ &einfügen | |
153 | + menutrans &Put\ Block Block\ &übertragen | |
153 | 154 | endif |
154 | 155 | |
155 | 156 | menutrans &Tools &Werkzeuge |
156 | 157 | menutrans &Jump\ to\ this\ tag<Tab>g^] &Springe\ zum\ Tag<Tab>g^] |
157 | -menutrans Jump\ &back<Tab>^T Springe\ &Zurück<Tab>^T | |
158 | -menutrans Build\ &Tags\ File Erstelle\ &Tags\ Datei | |
158 | +menutrans Jump\ &back<Tab>^T Springe\ &zurück<Tab>^T | |
159 | +menutrans Build\ &Tags\ File Erstelle\ &Tag-Datei | |
159 | 160 | menutrans &Make<Tab>:make &Erstellen<Tab>:make |
160 | -menutrans &List\ Errors<Tab>:cl &Fehler\ Anzeigen<Tab>:cl | |
161 | -menutrans L&ist\ Messages<Tab>:cl! &Hinweise\ Anzeigen<Tab>:cl! | |
162 | -menutrans &Next\ Error<Tab>:cn Zum\ &Nächsten\ Fehler<Tab>:cn | |
163 | -menutrans &Previous\ Error<Tab>:cp Zum\ &Vorherigen\ Fehler<Tab>:cp | |
161 | +menutrans &List\ Errors<Tab>:cl &Fehler\ anzeigen<Tab>:cl | |
162 | +menutrans L&ist\ Messages<Tab>:cl! &Hinweise\ anzeigen<Tab>:cl! | |
163 | +menutrans &Next\ Error<Tab>:cn Zum\ &nächsten\ Fehler<Tab>:cn | |
164 | +menutrans &Previous\ Error<Tab>:cp Zum\ &vorherigen\ Fehler<Tab>:cp | |
164 | 165 | menutrans &Older\ List<Tab>:cold &Ältere\ Liste<Tab>:cold |
165 | 166 | menutrans N&ewer\ List<Tab>:cnew &Neuere\ Liste<Tab>:cnew |
166 | 167 |
@@ -178,8 +179,8 @@ | ||
178 | 179 | " {{{ SYNTAX / SYNTAX |
179 | 180 | menutrans &Syntax &Syntax |
180 | 181 | menutrans &Show\ filetypes\ in\ menu Dateitypen\ an&zeigen |
181 | -menutrans Set\ '&syntax'\ only Nur\ '&syntax'\ Setzen | |
182 | -menutrans Set\ '&filetype'\ too Auch\ '&filetype'\ Setzen | |
182 | +menutrans Set\ '&syntax'\ only Nur\ '&syntax'\ setzen | |
183 | +menutrans Set\ '&filetype'\ too Auch\ '&filetype'\ setzen | |
183 | 184 | menutrans &Off &Aus |
184 | 185 | menutrans &Manual &Manuell |
185 | 186 | menutrans A&utomatic A&utomatisch |
@@ -202,11 +203,11 @@ | ||
202 | 203 | menutrans &Window &Ansicht |
203 | 204 | menutrans &New<Tab>^Wn &Neu<Tab>^Wn |
204 | 205 | menutrans S&plit<Tab>^Ws Aufs&palten<Tab>^Ws |
205 | -menutrans Split\ &Vertically<Tab>^Wv &Vertikal\ Aufspalten<Tab>^Wv | |
206 | +menutrans Split\ &Vertically<Tab>^Wv &Vertikal\ aufspalten<Tab>^Wv | |
206 | 207 | menutrans Split\ File\ E&xplorer Ver&zeichnis |
207 | 208 | menutrans Sp&lit\ To\ #<Tab>^W^^ Aufspa<en\ in\ #<Tab>^W^^ |
208 | 209 | menutrans &Close<Tab>^Wc &Schließen<Tab>^Wc |
209 | -menutrans Close\ &Other(s)<Tab>^Wo &Andere\ Schließen<Tab>^Wo | |
210 | +menutrans Close\ &Other(s)<Tab>^Wo &Andere\ schließen<Tab>^Wo | |
210 | 211 | menutrans Ne&xt<Tab>^Ww N&ächstes<Tab>^Ww |
211 | 212 | menutrans P&revious<Tab>^WW Vor&heriges<Tab>^WW |
212 | 213 | menutrans &Equal\ Size<Tab>^W= &Gleiche\ Höhen<Tab>^W= |
@@ -259,9 +260,9 @@ | ||
259 | 260 | delfun Do_toolbar_tmenu |
260 | 261 | endif |
261 | 262 | fun Do_toolbar_tmenu() |
262 | - tmenu ToolBar.Open Datei Öffnen | |
263 | - tmenu ToolBar.Save Datei Speichern | |
264 | - tmenu ToolBar.SaveAll Alle Dateien Speichern | |
263 | + tmenu ToolBar.Open Datei öffnen | |
264 | + tmenu ToolBar.Save Datei speichern | |
265 | + tmenu ToolBar.SaveAll Alle Dateien speichern | |
265 | 266 | tmenu ToolBar.Print Drucken |
266 | 267 | tmenu ToolBar.Undo Zurück |
267 | 268 | tmenu ToolBar.Redo Wiederholen |
@@ -269,25 +270,25 @@ | ||
269 | 270 | tmenu ToolBar.Copy Kopieren |
270 | 271 | tmenu ToolBar.Paste Einfügen |
271 | 272 | tmenu ToolBar.Find Suchen... |
272 | - tmenu ToolBar.FindNext Suche Nächsten | |
273 | - tmenu ToolBar.FindPrev Suche Vorherigen | |
273 | + tmenu ToolBar.FindNext Suche nächsten | |
274 | + tmenu ToolBar.FindPrev Suche vorherigen | |
274 | 275 | tmenu ToolBar.Replace Suchen und Ersetzen... |
275 | 276 | if 0 " disabled; These are in the Windows menu |
276 | 277 | tmenu ToolBar.New Neue Ansicht |
277 | - tmenu ToolBar.WinSplit Ansicht Aufspalten | |
278 | - tmenu ToolBar.WinMax Ansicht Maximale Höhen | |
279 | - tmenu ToolBar.WinMin Ansicht Minimale Höhen | |
280 | - tmenu ToolBar.WinClose Ansicht Schließen | |
278 | + tmenu ToolBar.WinSplit Ansicht aufspalten | |
279 | + tmenu ToolBar.WinMax Ansicht maximale Höhen | |
280 | + tmenu ToolBar.WinMin Ansicht minimale Höhen | |
281 | + tmenu ToolBar.WinClose Ansicht schließen | |
281 | 282 | endif |
282 | - tmenu ToolBar.LoadSesn Sitzung Laden | |
283 | - tmenu ToolBar.SaveSesn Sitzung Speichern | |
284 | - tmenu ToolBar.RunScript Vim-Skript Ausführen | |
283 | + tmenu ToolBar.LoadSesn Sitzung laden | |
284 | + tmenu ToolBar.SaveSesn Sitzung speichern | |
285 | + tmenu ToolBar.RunScript Vim-Skript ausführen | |
285 | 286 | tmenu ToolBar.Make Erstellen |
286 | - tmenu ToolBar.Shell Shell Starten | |
287 | - tmenu ToolBar.RunCtags Erstelle Tags Datei | |
287 | + tmenu ToolBar.Shell Shell starten | |
288 | + tmenu ToolBar.RunCtags Erstelle Tag-Datei | |
288 | 289 | tmenu ToolBar.TagJump Springe zum Tag |
289 | 290 | tmenu ToolBar.Help Hilfe! |
290 | - tmenu ToolBar.FindHelp Hilfe Durchsuchen... | |
291 | + tmenu ToolBar.FindHelp Hilfe durchsuchen... | |
291 | 292 | endfun |
292 | 293 | endif |
293 | 294 | " }}} TOOLBAR |
@@ -4287,6 +4287,13 @@ | ||
4287 | 4287 | if (eap->skip) /* not executing commands, only parsing */ |
4288 | 4288 | return; |
4289 | 4289 | |
4290 | + if (!do_count && !curbuf->b_p_ma) | |
4291 | + { | |
4292 | + /* Substitusion is not allowed in non-'modifiable' buffer */ | |
4293 | + EMSG(_(e_modifiable)); | |
4294 | + return; | |
4295 | + } | |
4296 | + | |
4290 | 4297 | if (search_regcomp(pat, RE_SUBST, which_pat, SEARCH_HIS, ®match) == FAIL) |
4291 | 4298 | { |
4292 | 4299 | if (do_error) |
@@ -768,7 +768,7 @@ | ||
768 | 768 | EX(CMD_rviminfo, "rviminfo", ex_viminfo, |
769 | 769 | BANG|FILE1|TRLBAR|CMDWIN), |
770 | 770 | EX(CMD_substitute, "substitute", do_sub, |
771 | - RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY), | |
771 | + RANGE|WHOLEFOLD|EXTRA|CMDWIN), | |
772 | 772 | EX(CMD_sNext, "sNext", ex_previous, |
773 | 773 | EXTRA|RANGE|NOTADR|COUNT|BANG|EDITCMD|ARGOPT|TRLBAR), |
774 | 774 | EX(CMD_sargument, "sargument", ex_argument, |
@@ -828,7 +828,7 @@ | ||
828 | 828 | EX(CMD_slast, "slast", ex_last, |
829 | 829 | EXTRA|BANG|EDITCMD|ARGOPT|TRLBAR), |
830 | 830 | EX(CMD_smagic, "smagic", ex_submagic, |
831 | - RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY), | |
831 | + RANGE|WHOLEFOLD|EXTRA|CMDWIN), | |
832 | 832 | EX(CMD_smap, "smap", ex_map, |
833 | 833 | EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN), |
834 | 834 | EX(CMD_smapclear, "smapclear", ex_mapclear, |
@@ -840,7 +840,7 @@ | ||
840 | 840 | EX(CMD_sniff, "sniff", ex_sniff, |
841 | 841 | EXTRA|TRLBAR), |
842 | 842 | EX(CMD_snomagic, "snomagic", ex_submagic, |
843 | - RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY), | |
843 | + RANGE|WHOLEFOLD|EXTRA|CMDWIN), | |
844 | 844 | EX(CMD_snoremap, "snoremap", ex_map, |
845 | 845 | EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN), |
846 | 846 | EX(CMD_snoremenu, "snoremenu", ex_menu, |
@@ -1488,7 +1488,7 @@ | ||
1488 | 1488 | * may cause a redraw. But wait_return() is a no-op when vgetc() |
1489 | 1489 | * is busy (Quit used from window menu), then make sure we don't |
1490 | 1490 | * cause a scroll up. */ |
1491 | - if (vgetc_busy) | |
1491 | + if (vgetc_busy > 0) | |
1492 | 1492 | { |
1493 | 1493 | msg_row = cmdline_row; |
1494 | 1494 | msg_col = 0; |
@@ -3696,20 +3696,20 @@ | ||
3696 | 3696 | * redefined and it doesn't use the arguments. */ |
3697 | 3697 | loc = setlocale(what, NULL); |
3698 | 3698 | |
3699 | -# if defined(__BORLANDC__) | |
3699 | +# ifdef WIN32 | |
3700 | 3700 | if (loc != NULL) |
3701 | 3701 | { |
3702 | 3702 | char_u *p; |
3703 | 3703 | |
3704 | - /* Borland returns something like "LC_CTYPE=<name>\n" | |
3705 | - * Let's try to fix that bug here... */ | |
3704 | + /* setocale() returns something like "LC_COLLATE=<name>;LC_..." when | |
3705 | + * one of the values (e.g., LC_CTYPE) differs. */ | |
3706 | 3706 | p = vim_strchr(loc, '='); |
3707 | 3707 | if (p != NULL) |
3708 | 3708 | { |
3709 | 3709 | loc = ++p; |
3710 | 3710 | while (*p != NUL) /* remove trailing newline */ |
3711 | 3711 | { |
3712 | - if (*p < ' ') | |
3712 | + if (*p < ' ' || *p == ';') | |
3713 | 3713 | { |
3714 | 3714 | *p = NUL; |
3715 | 3715 | break; |
@@ -3778,8 +3778,10 @@ | ||
3778 | 3778 | p = (char_u *)get_locale_val(LC_MESSAGES); |
3779 | 3779 | # else |
3780 | 3780 | /* This is necessary for Win32, where LC_MESSAGES is not defined and $LANG |
3781 | - * may be set to the LCID number. */ | |
3782 | - p = (char_u *)get_locale_val(LC_ALL); | |
3781 | + * may be set to the LCID number. LC_COLLATE is the best guess, LC_TIME | |
3782 | + * and LC_MONETARY may be set differently for a Japanese working in the | |
3783 | + * US. */ | |
3784 | + p = (char_u *)get_locale_val(LC_COLLATE); | |
3783 | 3785 | # endif |
3784 | 3786 | # else |
3785 | 3787 | p = mch_getenv((char_u *)"LC_ALL"); |
@@ -2474,7 +2474,7 @@ | ||
2474 | 2474 | double bottom; |
2475 | 2475 | #ifdef FEAT_MBYTE |
2476 | 2476 | int props; |
2477 | - int cmap; | |
2477 | + int cmap = 0; | |
2478 | 2478 | char_u *p_encoding; |
2479 | 2479 | struct prt_ps_encoding_S *p_mbenc; |
2480 | 2480 | struct prt_ps_encoding_S *p_mbenc_first; |
@@ -35,6 +35,6 @@ | ||
35 | 35 | */ |
36 | 36 | #define VIM_VERSION_NODOT "vim70c" |
37 | 37 | #define VIM_VERSION_SHORT "7.0c" |
38 | -#define VIM_VERSION_MEDIUM "7.0c11 BETA" | |
39 | -#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0c11 BETA (2006 Apr 6)" | |
40 | -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0c11 BETA (2006 Apr 6, compiled " | |
38 | +#define VIM_VERSION_MEDIUM "7.0c12 BETA" | |
39 | +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0c12 BETA (2006 Apr 7)" | |
40 | +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0c12 BETA (2006 Apr 7, compiled " |