• R/O
  • SSH

vim: コミット

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

変更サマリ

差分

diff -r 45fad0f590d0 -r 9ab23f1e137f runtime/doc/autocmd.txt
--- a/runtime/doc/autocmd.txt Fri Apr 07 21:33:12 2006 +0000
+++ b/runtime/doc/autocmd.txt Fri Apr 07 21:40:07 2006 +0000
@@ -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
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -506,8 +506,8 @@
506506 the change was caused by an autocommand.
507507 This event is triggered when making the first
508508 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.
511511 WARNING: If the autocommand moves the cursor
512512 the effect of the change is undefined.
513513 *E788*
diff -r 45fad0f590d0 -r 9ab23f1e137f runtime/doc/eval.txt
--- a/runtime/doc/eval.txt Fri Apr 07 21:33:12 2006 +0000
+++ b/runtime/doc/eval.txt Fri Apr 07 21:40:07 2006 +0000
@@ -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
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -819,7 +819,7 @@
819819 Index zero gives the first character. This is like it works in C. Careful:
820820 text column numbers start with one! Example, to get the character under the
821821 cursor: >
822- :let c = getline(line("."))[col(".") - 1]
822+ :let c = getline(".")[col(".") - 1]
823823
824824 If the length of the String is less than the index, the result is an empty
825825 String. A negative index always results in an empty string (reason: backwards
@@ -4562,7 +4562,7 @@
45624562 strpart("abcdefg", 3) == "defg"
45634563 < Note: To get the first character, {start} must be 0. For
45644564 example, to get three bytes under and after the cursor: >
4565- strpart(getline(line(".")), col(".") - 1, 3)
4565+ strpart(getline("."), col(".") - 1, 3)
45664566 <
45674567 strridx({haystack}, {needle} [, {start}]) *strridx()*
45684568 The result is a Number, which gives the byte index in
diff -r 45fad0f590d0 -r 9ab23f1e137f runtime/doc/syntax.txt
--- a/runtime/doc/syntax.txt Fri Apr 07 21:33:12 2006 +0000
+++ b/runtime/doc/syntax.txt Fri Apr 07 21:40:07 2006 +0000
@@ -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
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2581,7 +2581,7 @@
25812581
25822582 Do you want to draw with the mouse? Try the following: >
25832583 :function! GetPixel()
2584- : let c = getline(line("."))[col(".") - 1]
2584+ : let c = getline(".")[col(".") - 1]
25852585 : echo c
25862586 : exe "noremap <LeftMouse> <LeftMouse>r".c
25872587 : exe "noremap <LeftDrag> <LeftMouse>r".c
diff -r 45fad0f590d0 -r 9ab23f1e137f runtime/doc/tags
--- a/runtime/doc/tags Fri Apr 07 21:33:12 2006 +0000
+++ b/runtime/doc/tags Fri Apr 07 21:40:07 2006 +0000
@@ -5611,7 +5611,6 @@
56115611 hebrew.txt hebrew.txt /*hebrew.txt*
56125612 help various.txt /*help*
56135613 help-context help.txt /*help-context*
5614-help-tags tags 1
56155614 help-translated various.txt /*help-translated*
56165615 help-xterm-window various.txt /*help-xterm-window*
56175616 help.txt help.txt /*help.txt*
diff -r 45fad0f590d0 -r 9ab23f1e137f runtime/doc/todo.txt
--- a/runtime/doc/todo.txt Fri Apr 07 21:33:12 2006 +0000
+++ b/runtime/doc/todo.txt Fri Apr 07 21:40:07 2006 +0000
@@ -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
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -30,6 +30,13 @@
3030 *known-bugs*
3131 -------------------- Known bugs and current work -----------------------
3232
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+
3340 New Hungarian dictionary. (Laci Nemeth)
3441 - implement use of <compoptions> in .spl file:
3542 - implement CHECKCOMPOUNDREP: when a compound word seems to be OK apply REP
diff -r 45fad0f590d0 -r 9ab23f1e137f runtime/doc/version7.txt
--- a/runtime/doc/version7.txt Fri Apr 07 21:33:12 2006 +0000
+++ b/runtime/doc/version7.txt Fri Apr 07 21:40:07 2006 +0000
@@ -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
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -160,6 +160,7 @@
160160 When executing a FileChangedRO autocommand it is no longer allowed to switch
161161 to another buffer or edit another file. This is to prevent crashes (the event
162162 is triggered deep down in the code where changing buffers is not anticipated).
163+It is possible to reload the buffer.
163164
164165 ==============================================================================
165166 NEW FEATURES *new-7*
@@ -951,6 +952,7 @@
951952 services syntax and ftplugin file. (Nikolai Weibull)
952953 setserial syntax and ftplugin file. (Nikolai Weibull)
953954 sieve syntax and ftplugin file. (Nikolai Weibull)
955+SiSU syntax file (Ralph Amissah)
954956 Sive syntax file. (Nikolai Weibull)
955957 slp config, reg and spi syntax and ftplugin files. (Nikolai Weibull)
956958 SML indent file. (Saikat Guha)
@@ -2394,4 +2396,19 @@
23942396 where the click was. Beyond the labels the new tab appears at the end instead
23952397 of after the current tab page.
23962398
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+
23972414 vim:tw=78:ts=8:ft=help:norl:
diff -r 45fad0f590d0 -r 9ab23f1e137f runtime/lang/menu_de_de.latin1.vim
--- a/runtime/lang/menu_de_de.latin1.vim Fri Apr 07 21:33:12 2006 +0000
+++ b/runtime/lang/menu_de_de.latin1.vim Fri Apr 07 21:40:07 2006 +0000
@@ -1,7 +1,7 @@
11 " Menu Translations: German / Deutsch
22 " Maintainer: Georg Dahn <gorgyd@yahoo.co.uk>
33 " Originally By: Marcin Dalecki <dalecki@cs.net.pl>
4-" Johannes Zellner <johannes@zellner.org>
4+" Johannes Zellner <johannes@zellner.org>
55 " Last Change: Sat, 11 Mar 2006 22:40:00 CEST
66 " vim:set foldmethod=marker tabstop=8:
77
@@ -20,12 +20,12 @@
2020 " {{{ FILE / DATEI
2121 menutrans &File &Datei
2222 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
2525 menutrans &New<Tab>:enew &Neue\ Datei<Tab>:enew
2626 menutrans &Close<Tab>:close S&chließen<Tab>:close
2727 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
2929 menutrans &Print &Drucken
3030 menutrans Sa&ve-Exit<Tab>:wqa Speichern\ und\ Be&enden<Tab>:wqa
3131 menutrans E&xit<Tab>:qa &Beenden<Tab>:qa
@@ -44,10 +44,10 @@
4444 menutrans Cu&t<Tab>"+x &Ausschneiden<Tab>"+x
4545 menutrans &Copy<Tab>"+y &Kopieren<Tab>"+y
4646 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
5151 menutrans &Find\.\.\. &Suchen\.\.\.
5252 menutrans Find\ and\ Rep&lace\.\.\. Suchen\ und\ &Ersetzen\.\.\.
5353
@@ -55,6 +55,7 @@
5555 " XXX &E would conflict with 'Suchen\ und\ &Ersetzen', see above
5656 menutrans Settings\ &Window E&instellungen\.\.\.
5757 menutrans &Global\ Settings &Globale\ Einstellungen
58+menutrans Startup\ &Settings &Starteinstellungen
5859
5960 menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! &Hervorhebungen\ ein-\ und\ ausschalten<Tab>:set\ hls!
6061 menutrans Toggle\ &Ignore-case<Tab>:set\ ic! Großschreibung\ &ignorieren\ oder\ benutzen<Tab>:set\ ic!
@@ -66,7 +67,7 @@
6667 menutrans Never Nie
6768 menutrans Block\ Selection Block-Auswahl
6869 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
7071 menutrans Always Immer
7172 menutrans Toggle\ Insert\ &Mode<Tab>:set\ im! Einfüge-&Modus\ ein-\ und\ ausschalten<Tab>:set\ im!
7273 menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp! Vi-Kompatibilität\ ein-\ und\ ausschalten<Tab>:set\ cp!
@@ -94,19 +95,19 @@
9495 " other options
9596 menutrans &Shiftwidth &Schiebeweite
9697 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\.\.\.
99100 menutrans C&olor\ Scheme F&arbschema\.\.\.
100-menutrans &Keymap &Tastatur-Belegung
101+menutrans &Keymap &Tastaturbelegung
101102 " }}} EDIT / EDITIEREN
102103
103104 " {{{ TOOLS / WERKZEUGE
104105 if has("spell")
105106 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
110111 menutrans Suggest\ &Corrections<Tab>z= &Korrekturvorschläge<Tab>z=
111112 menutrans &Repeat\ correction<Tab>:spellrepall &Wiederhole\ Korrektur<Tab>:spellrepall
112113 menutrans Set\ language\ to\ "en" Verwende\ Wörterbuch\ "en"
@@ -115,7 +116,7 @@
115116 menutrans Set\ language\ to\ "en_gb" Verwende\ Wörterbuch\ "en_gb"
116117 menutrans Set\ language\ to\ "en_nz" Verwende\ Wörterbuch\ "en_nz"
117118 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"
119120 menutrans &Find\ More\ Languages &Suche\ nach\ Wörterbüchern
120121 endif
121122 if has("folding")
@@ -138,29 +139,29 @@
138139 menutrans Ma&rker Ma&rkierungen
139140 " create and delete folds
140141 " 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
144145 " moving around in folds
145- menutrans Fold\ column\ &width &Breite\ der\ Faltungs-Spalte
146+ menutrans Fold\ column\ &width &Breite\ der\ Faltungsspalte
146147 endif " has folding
147148
148149 if has("diff")
149150 menutrans &Diff &Differenz
150151 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
153154 endif
154155
155156 menutrans &Tools &Werkzeuge
156157 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
159160 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
164165 menutrans &Older\ List<Tab>:cold &Ältere\ Liste<Tab>:cold
165166 menutrans N&ewer\ List<Tab>:cnew &Neuere\ Liste<Tab>:cnew
166167
@@ -178,8 +179,8 @@
178179 " {{{ SYNTAX / SYNTAX
179180 menutrans &Syntax &Syntax
180181 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
183184 menutrans &Off &Aus
184185 menutrans &Manual &Manuell
185186 menutrans A&utomatic A&utomatisch
@@ -202,11 +203,11 @@
202203 menutrans &Window &Ansicht
203204 menutrans &New<Tab>^Wn &Neu<Tab>^Wn
204205 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
206207 menutrans Split\ File\ E&xplorer Ver&zeichnis
207208 menutrans Sp&lit\ To\ #<Tab>^W^^ Aufspa&lten\ in\ #<Tab>^W^^
208209 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
210211 menutrans Ne&xt<Tab>^Ww N&ächstes<Tab>^Ww
211212 menutrans P&revious<Tab>^WW Vor&heriges<Tab>^WW
212213 menutrans &Equal\ Size<Tab>^W= &Gleiche\ Höhen<Tab>^W=
@@ -259,9 +260,9 @@
259260 delfun Do_toolbar_tmenu
260261 endif
261262 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
265266 tmenu ToolBar.Print Drucken
266267 tmenu ToolBar.Undo Zurück
267268 tmenu ToolBar.Redo Wiederholen
@@ -269,25 +270,25 @@
269270 tmenu ToolBar.Copy Kopieren
270271 tmenu ToolBar.Paste Einfügen
271272 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
274275 tmenu ToolBar.Replace Suchen und Ersetzen...
275276 if 0 " disabled; These are in the Windows menu
276277 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
281282 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
285286 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
288289 tmenu ToolBar.TagJump Springe zum Tag
289290 tmenu ToolBar.Help Hilfe!
290- tmenu ToolBar.FindHelp Hilfe Durchsuchen...
291+ tmenu ToolBar.FindHelp Hilfe durchsuchen...
291292 endfun
292293 endif
293294 " }}} TOOLBAR
diff -r 45fad0f590d0 -r 9ab23f1e137f src/ex_cmds.c
--- a/src/ex_cmds.c Fri Apr 07 21:33:12 2006 +0000
+++ b/src/ex_cmds.c Fri Apr 07 21:40:07 2006 +0000
@@ -4287,6 +4287,13 @@
42874287 if (eap->skip) /* not executing commands, only parsing */
42884288 return;
42894289
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+
42904297 if (search_regcomp(pat, RE_SUBST, which_pat, SEARCH_HIS, &regmatch) == FAIL)
42914298 {
42924299 if (do_error)
diff -r 45fad0f590d0 -r 9ab23f1e137f src/ex_cmds.h
--- a/src/ex_cmds.h Fri Apr 07 21:33:12 2006 +0000
+++ b/src/ex_cmds.h Fri Apr 07 21:40:07 2006 +0000
@@ -768,7 +768,7 @@
768768 EX(CMD_rviminfo, "rviminfo", ex_viminfo,
769769 BANG|FILE1|TRLBAR|CMDWIN),
770770 EX(CMD_substitute, "substitute", do_sub,
771- RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY),
771+ RANGE|WHOLEFOLD|EXTRA|CMDWIN),
772772 EX(CMD_sNext, "sNext", ex_previous,
773773 EXTRA|RANGE|NOTADR|COUNT|BANG|EDITCMD|ARGOPT|TRLBAR),
774774 EX(CMD_sargument, "sargument", ex_argument,
@@ -828,7 +828,7 @@
828828 EX(CMD_slast, "slast", ex_last,
829829 EXTRA|BANG|EDITCMD|ARGOPT|TRLBAR),
830830 EX(CMD_smagic, "smagic", ex_submagic,
831- RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY),
831+ RANGE|WHOLEFOLD|EXTRA|CMDWIN),
832832 EX(CMD_smap, "smap", ex_map,
833833 EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
834834 EX(CMD_smapclear, "smapclear", ex_mapclear,
@@ -840,7 +840,7 @@
840840 EX(CMD_sniff, "sniff", ex_sniff,
841841 EXTRA|TRLBAR),
842842 EX(CMD_snomagic, "snomagic", ex_submagic,
843- RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY),
843+ RANGE|WHOLEFOLD|EXTRA|CMDWIN),
844844 EX(CMD_snoremap, "snoremap", ex_map,
845845 EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
846846 EX(CMD_snoremenu, "snoremenu", ex_menu,
diff -r 45fad0f590d0 -r 9ab23f1e137f src/ex_cmds2.c
--- a/src/ex_cmds2.c Fri Apr 07 21:33:12 2006 +0000
+++ b/src/ex_cmds2.c Fri Apr 07 21:40:07 2006 +0000
@@ -1488,7 +1488,7 @@
14881488 * may cause a redraw. But wait_return() is a no-op when vgetc()
14891489 * is busy (Quit used from window menu), then make sure we don't
14901490 * cause a scroll up. */
1491- if (vgetc_busy)
1491+ if (vgetc_busy > 0)
14921492 {
14931493 msg_row = cmdline_row;
14941494 msg_col = 0;
@@ -3696,20 +3696,20 @@
36963696 * redefined and it doesn't use the arguments. */
36973697 loc = setlocale(what, NULL);
36983698
3699-# if defined(__BORLANDC__)
3699+# ifdef WIN32
37003700 if (loc != NULL)
37013701 {
37023702 char_u *p;
37033703
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. */
37063706 p = vim_strchr(loc, '=');
37073707 if (p != NULL)
37083708 {
37093709 loc = ++p;
37103710 while (*p != NUL) /* remove trailing newline */
37113711 {
3712- if (*p < ' ')
3712+ if (*p < ' ' || *p == ';')
37133713 {
37143714 *p = NUL;
37153715 break;
@@ -3778,8 +3778,10 @@
37783778 p = (char_u *)get_locale_val(LC_MESSAGES);
37793779 # else
37803780 /* 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);
37833785 # endif
37843786 # else
37853787 p = mch_getenv((char_u *)"LC_ALL");
diff -r 45fad0f590d0 -r 9ab23f1e137f src/hardcopy.c
--- a/src/hardcopy.c Fri Apr 07 21:33:12 2006 +0000
+++ b/src/hardcopy.c Fri Apr 07 21:40:07 2006 +0000
@@ -2474,7 +2474,7 @@
24742474 double bottom;
24752475 #ifdef FEAT_MBYTE
24762476 int props;
2477- int cmap;
2477+ int cmap = 0;
24782478 char_u *p_encoding;
24792479 struct prt_ps_encoding_S *p_mbenc;
24802480 struct prt_ps_encoding_S *p_mbenc_first;
diff -r 45fad0f590d0 -r 9ab23f1e137f src/version.h
--- a/src/version.h Fri Apr 07 21:33:12 2006 +0000
+++ b/src/version.h Fri Apr 07 21:40:07 2006 +0000
@@ -35,6 +35,6 @@
3535 */
3636 #define VIM_VERSION_NODOT "vim70c"
3737 #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 "
旧リポジトリブラウザで表示