diff options
28 files changed, 990 insertions, 1518 deletions
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt index 92840d40ec..ec7d2396ea 100644 --- a/runtime/doc/if_pyth.txt +++ b/runtime/doc/if_pyth.txt @@ -1,4 +1,4 @@ -*if_pyth.txt* For Vim version 7.3. Last change: 2012 Aug 02 +*if_pyth.txt* For Vim version 7.3. Last change: 2012 Sep 23 VIM REFERENCE MANUAL by Paul Moore @@ -165,7 +165,7 @@ vim.bindeval(str) *python-bindeval* Value Meaning ~ zero Variable is not locked vim.VAR_LOCKED Variable is locked, but can be unlocked - vim.VAR_FIXED Variable is locked and can’t be unlocked + vim.VAR_FIXED Variable is locked and can't be unlocked integer constants. If variable is not fixed, you can do `var.locked=True` to lock it and `var.locked=False` to unlock. There is no recursive locking like |:lockvar|! does. There is also diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index e3e6bbbffc..275b7ac45a 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.3. Last change: 2012 Sep 21 +*todo.txt* For Vim version 7.3. Last change: 2012 Oct 03 VIM REFERENCE MANUAL by Bram Moolenaar @@ -36,18 +36,20 @@ not be repeated below, unless there is extra information. Go through more coverity reports. -Ruby problem, patch in issue 49. (Sep 19) -Also in email from Ondruch? - Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10) -GTK: problem with 'L' in 'guioptions' changing the window width. -(Aaron Cornelius, 2012 Feb 6) - Checking runtime scripts: Thilo Six, 2012 Jun 6. Crash with 1023 byte directory name. (Danek Duvall, 2012 Sep 19) +Patch for wrong text in balloon, Issue 58. (Dominique Pelle) + +Patch for menu.vim to correct message about adding spell file. +(Jiri Sedlak, 2012 Sep 24) + +GTK: problem with 'L' in 'guioptions' changing the window width. +(Aaron Cornelius, 2012 Feb 6) + Patch for SGR mouse with older xterm. (Hayaki Saito, 2012 Sep 19) Patch for crash with an autocommand. (ZyX, 2012 Sep 6, second one) @@ -79,16 +81,32 @@ Aug 16) the order they were made. Also ":gredo". Both with a count. Useful when tests fail after making changes and you forgot in which files. +Crash with vimdiff. (Don Cruickshank, 2012 Sep 23) + +Win32: use 'guifontwide' for IME composition. (Taro Muraoka, 2012 Sep 30) +Update Oct 2. + +Patch to make multibyte input work on Win32 console when codepage differs from +'encoding'. (Ken Takata, 2012 Sep 29) + +It's possible to defined an input() function that overrides the built-in one. +(ZyX, 2012 Sep 28) + Win32: When a directory name contains an exclamation mark, completion doesn't complete the contents of the directory. No escaping for the "!"? (Jan Stocker, 2012 Jan 5) +Patch to support 'u' in interactive substitute. (Christian Brabandt, 2012 Sep +28) Asked for tests. + Patch for IME handling, adds 'imactivatefunc' and 'imstatusfunc' option. (Yukihiro Nakadaira, 2012 Aug 16) Patch to improve IME handling. (Yasuhiro Matsumoto, 2012 Jul 18) Issue 54: document behavior of -complete, also expands arg. +New syntax files for apt. (quidame, 2012 Sep 21) + Patch for if_lua. (Luis Carvalho, 2012 Aug 26, update Aug 29, another Aug 30, then Sep 1) @@ -156,6 +174,7 @@ Do give the prompt? Quit with an error? Patch for 'backupcopy' default behavior for symlinks on Windows. (David Pope, 2012 Mar 21, update Mar 31) With fix for memory leak: Ken Takata, 2012 Aug 24 +Another update Sep 24. Patch to list user digraphs. (Christian Brabandt, 2012 Apr 14) diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 6f6bc812ad..5010d68773 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2012 Sep 06 +" Last Change: 2012 Oct 03 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -633,6 +633,9 @@ au BufNewFile,BufRead *.dsl setf dsl " DTD (Document Type Definition for XML) au BufNewFile,BufRead *.dtd setf dtd +" DTS/DSTI (device tree files) +au BufNewFile,BufRead *.dts,*.dtsi setf dts + " EDIF (*.edf,*.edif,*.edn,*.edo) au BufNewFile,BufRead *.ed\(f\|if\|n\|o\) setf edif diff --git a/runtime/syntax/synload.vim b/runtime/syntax/synload.vim index 9b28fd8f41..48b5956b3c 100644 --- a/runtime/syntax/synload.vim +++ b/runtime/syntax/synload.vim @@ -1,6 +1,6 @@ " Vim syntax support file " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2012 Feb 11 +" Last Change: 2012 Sep 25 " This file sets up for syntax highlighting. " It is loaded from "syntax.vim" and "manual.vim". @@ -46,6 +46,8 @@ fun! s:SynSet() echohl None endif let s = &filetype + elseif s == "OFF" + let s = "" endif if s != "" diff --git a/runtime/tutor/tutor b/runtime/tutor/tutor index daf42b6bb2..da28a15313 100644 --- a/runtime/tutor/tutor +++ b/runtime/tutor/tutor @@ -658,7 +658,7 @@ NOTE: If you were to exit Vim and start it again with vim TEST , the file 4. Type w TEST , where TEST is a filename that does not exist yet. Verify that you see :'<,'>w TEST before you press <ENTER>. - 5. Vim will write the selected lines to the file TEST. Use :!dir or !ls + 5. Vim will write the selected lines to the file TEST. Use :!dir or :!ls to see it. Do not remove it yet! We will use it in the next lesson. NOTE: Pressing v starts Visual selection. You can move the cursor around diff --git a/runtime/tutor/tutor.eo.utf-8 b/runtime/tutor/tutor.eo.utf-8 index 41f40726d9..44d7b29a37 100644 --- a/runtime/tutor/tutor.eo.utf-8 +++ b/runtime/tutor/tutor.eo.utf-8 @@ -645,7 +645,7 @@ RIMARKO: Ĉiuj : komandoj devas finiĝi per tajpo de <Enenklavo> 3. Nun tajpu: :w TESTO (kie TESTO estas la elektita dosiernomo) 4. Tio konservas la tutan dosieron (instruilon de Vim) kun la nomo TESTO. - Por kontroli tion, tajpu :!dir aŭ !ls denove por vidigi vian + Por kontroli tion, tajpu :!dir aŭ :!ls denove por vidigi vian dosierujon. RIMARKO: Se vi volus eliri el Vim kaj restartigi ĝin denove per vim TESTO, diff --git a/runtime/tutor/tutor.fr b/runtime/tutor/tutor.fr index f51a62e532..2eb92d5e95 100644 --- a/runtime/tutor/tutor.fr +++ b/runtime/tutor/tutor.fr @@ -707,7 +707,7 @@ NOTE : Si vous quittez Vim et le redmarrez de nouveau avec le fichier TEST, Vrifiez que vous voyez :'<,'>w TEST avant de d'appuyer sur <Entre>. 5. Vim va enregistrer les lignes slectionnes dans le fichier TEST. - Utilisez :!dir ou !ls pour le voir. Ne l'effacez pas encore ! + Utilisez :!dir ou :!ls pour le voir. Ne l'effacez pas encore ! Nous allons l'utiliser dans la leon suivante. NOTE : L'appui de v dmarre la slection Visuelle. Vous pouvez dplacer le diff --git a/runtime/tutor/tutor.fr.utf-8 b/runtime/tutor/tutor.fr.utf-8 index 6281538939..9e1087de64 100644 --- a/runtime/tutor/tutor.fr.utf-8 +++ b/runtime/tutor/tutor.fr.utf-8 @@ -707,7 +707,7 @@ NOTE : Si vous quittez Vim et le redémarrez de nouveau avec le fichier TEST, Vérifiez que vous voyez :'<,'>w TEST avant de d'appuyer sur <Entrée>. 5. Vim va enregistrer les lignes sélectionnées dans le fichier TEST. - Utilisez :!dir ou !ls pour le voir. Ne l'effacez pas encore ! + Utilisez :!dir ou :!ls pour le voir. Ne l'effacez pas encore ! Nous allons l'utiliser dans la leçon suivante. NOTE : L'appui de v démarre la sélection Visuelle. Vous pouvez déplacer le diff --git a/runtime/tutor/tutor.hr b/runtime/tutor/tutor.hr index f1d346c2ac..90443bf659 100644 --- a/runtime/tutor/tutor.hr +++ b/runtime/tutor/tutor.hr @@ -659,7 +659,7 @@ NAPOMENA: Ako bi napustili Vim i ponovno ga pokrenuli sa vim TEST , Provjerite da zaista pie :'<,'>w TEST prije nego to pritisnite <ENTER>. - 5. Vim e spremiti oznaeni tekst u TEST. Provjerite sa :!dir ili !ls . + 5. Vim e spremiti oznaeni tekst u TEST. Provjerite sa :!dir ili :!ls . Nemojte je jo brisati! Koristiti e te je u sljedeoj lekciji. NAPOMENA: Tipka v zapoinje Vizualno oznaavanje. Moete pomicati kursor diff --git a/runtime/tutor/tutor.hr.cp1250 b/runtime/tutor/tutor.hr.cp1250 index 92771ab22b..1956a8aba0 100644 --- a/runtime/tutor/tutor.hr.cp1250 +++ b/runtime/tutor/tutor.hr.cp1250 @@ -659,7 +659,7 @@ NAPOMENA: Ako bi napustili Vim i ponovno ga pokrenuli sa vim TEST , Provjerite da zaista pie :'<,'>w TEST prije nego to pritisnite <ENTER>. - 5. Vim e spremiti oznaeni tekst u TEST. Provjerite sa :!dir ili !ls . + 5. Vim e spremiti oznaeni tekst u TEST. Provjerite sa :!dir ili :!ls . Nemojte je jo brisati! Koristiti e te je u sljedeoj lekciji. NAPOMENA: Tipka v zapoinje Vizualno oznaavanje. Moete pomicati kursor diff --git a/runtime/tutor/tutor.hr.utf-8 b/runtime/tutor/tutor.hr.utf-8 index 396bdfeb14..79838ec7f2 100644 --- a/runtime/tutor/tutor.hr.utf-8 +++ b/runtime/tutor/tutor.hr.utf-8 @@ -659,7 +659,7 @@ NAPOMENA: Ako bi napustili Vim i ponovno ga pokrenuli sa vim TEST , Provjerite da zaista piše :'<,'>w TEST prije nego što pritisnite <ENTER>. - 5. Vim će spremiti označeni tekst u TEST. Provjerite sa :!dir ili !ls . + 5. Vim će spremiti označeni tekst u TEST. Provjerite sa :!dir ili :!ls . Nemojte je još brisati! Koristiti će te je u sljedećoj lekciji. NAPOMENA: Tipka v započinje Vizualno označavanje. Možete pomicati kursor diff --git a/runtime/tutor/tutor.ja.euc b/runtime/tutor/tutor.ja.euc index 513439344e..2734ee8ca3 100644 --- a/runtime/tutor/tutor.ja.euc +++ b/runtime/tutor/tutor.ja.euc @@ -117,7 +117,7 @@ NOTE: ƤΥå̤ơФ褦ȤΤǤϤʤºݤˤäƤߤޤ礦 å 1.5: ƥԽ - ɲ - ** ƥɲäˤ A ޤ礦 ** + ** ƥȤɲäˤ A ޤ礦 ** 1. ʲ ---> ȼ줿ǽιԤ˥ưޤ礦 뤬ʸˤäƤ⤫ޤޤ @@ -232,7 +232,7 @@ NOTE: <ESC> ȥΡޥ⡼ɤ˰ܹԤޤκݡְä å 2.3: ڥ졼ȥ⡼ - ¿Υޥɤϥڥ졼ȥ⡼ƥȤѹäޤ + ¿Υޥɤϥڥ졼ȥ⡼ƥȤѹäޤ ޥ d Υڥ졼ϼͤˤʤäƤޤ: d ⡼ @@ -259,7 +259,7 @@ NOTE: ͤϡΡޥ⡼ɤˤƥޥɤʤ˥⡼ 1. ʲ ---> ȼ줿ԤƬ˥ưޤ - 2. 2dw פñ2ʬưޤ + 2. 2dw פñ2ʬޤ 3. 3e פ3ܤñνü˰ưޤ @@ -326,8 +326,8 @@ NOTE: ڥ졼 d ȥ⡼δ֤˥ȤȤä硢ڥ졼Τʤ ** ǸΥޥɤäˤ u ޤU ϹΤμäǤ ** - 1. ʲ ---> ȼ줿Ԥ˥ưǽδְ㤤˥ - ưޤ礦 + 1. ʲ ---> ȼ줿Ԥ˥ưǽδְ㤤˥ + ưޤ礦 2. x פƤʤƬʸޤ礦 3. u פƺǸ˼¹Ԥޥɤäޤ礦 4. ٤ϡx ѤƸƽޤ礦 diff --git a/runtime/tutor/tutor.ja.sjis b/runtime/tutor/tutor.ja.sjis index 7be2120a5c..fe3be23b44 100644 --- a/runtime/tutor/tutor.ja.sjis +++ b/runtime/tutor/tutor.ja.sjis @@ -117,7 +117,7 @@ NOTE: SẴbXʂāAo悤Ƃ̂ł͂ȂۂɂĂ݂܂傤B bX 1.5: eLXgҏW - lj - ** eLXgljɂ A ܂傤 ** + ** eLXgljɂ A ܂傤 ** 1. ȉ ---> Ǝꂽŏ̍sɃJ[\ړ܂傤B J[\̕ɂĂ܂܂B @@ -232,7 +232,7 @@ NOTE: <ESC> L[ƃm[}[hɈڍs܂B̍ہAԈ͓r bX 2.3: Iy[^ƃ[V - ̃R}h̓Iy[^ƃ[VeLXgɕύX܂B + ̃R}h̓Iy[^ƃ[VeLXgɕύX܂B 폜R}h d ̃Iy[^͎̗lɂȂĂ܂: d [V @@ -259,7 +259,7 @@ NOTE: `ĺAm[}[hɂăR}hȂɃ[V 1. ȉ ---> Ǝꂽs̐擪ɃJ[\ړ܂B - 2. 2dw ^CvĒP2ړ܂B + 2. 2dw ^CvĒP2폜܂B 3. 3e ^Cv3ڂ̒P̏I[Ɉړ܂B @@ -326,8 +326,8 @@ NOTE: Iy[^ d ƃ[V̊ԂɃJEggꍇAIy[^̂Ȃ ** Ō̃R}hɂ u ܂BU ͍sŜ̎łB ** - 1. ȉ ---> ƎꂽsɃJ[\ړAŏ̊ԈႢɃJ[\ - ړ܂傤B + 1. ȉ ---> ƎꂽsɃJ[\ړAŏ̊ԈႢɃJ[\ + ړ܂傤B 2. x ^CvĂȂ擪̕폜܂傤B 3. Au ^CvčŌɎsR}h܂傤B 4. x́Ax gpČSďC܂傤B diff --git a/runtime/tutor/tutor.ja.utf-8 b/runtime/tutor/tutor.ja.utf-8 index 95e108efe6..a620cd57a3 100644 --- a/runtime/tutor/tutor.ja.utf-8 +++ b/runtime/tutor/tutor.ja.utf-8 @@ -117,7 +117,7 @@ NOTE: 全てのレッスンを通じて、覚えようとするのではなく レッスン 1.5: テキスト編集 - 追加 - ** テキスト追加するには A を押しましょう ** + ** テキストを追加するには A を押しましょう ** 1. 以下の ---> と示された最初の行にカーソルを移動しましょう。 カーソルがその文字上にあってもかまいません。 @@ -232,7 +232,7 @@ NOTE: <ESC> キーを押すとノーマルモードに移行します。その レッスン 2.3: オペレータとモーション - 多くのコマンドはオペレータとモーションからテキストに変更を加ます。 + 多くのコマンドはオペレータとモーションからテキストに変更を加えます。 削除コマンド d のオペレータは次の様になっています: d モーション @@ -259,7 +259,7 @@ NOTE: 冒険したい人は、ノーマルモードにてコマンドなしに 1. 以下の ---> と示された行の先頭にカーソルを移動します。 - 2. 2dw をタイプして単語2つ分移動します。 + 2. 2dw をタイプして単語2つ分削除します。 3. 3e をタイプして3つ目の単語の終端に移動します。 @@ -326,8 +326,8 @@ NOTE: オペレータ d とモーションの間にカウントを使った場 ** 最後のコマンドを取り消すには u を押します。U は行全体の取消です。 ** - 1. 以下の ---> と示された行にカーソルを移動し、最初の間違いにカーソ - ルを移動しましょう。 + 1. 以下の ---> と示された行にカーソルを移動し、最初の間違いにカーソル + を移動しましょう。 2. x をタイプしていらない先頭の文字を削除しましょう。 3. さぁ、u をタイプして最後に実行したコマンドを取り消しましょう。 4. 今度は、x を使用して誤りを全て修正しましょう。 diff --git a/runtime/tutor/tutor.ko.euc b/runtime/tutor/tutor.ko.euc index ddfc5ac810..95282f86ee 100644 --- a/runtime/tutor/tutor.ko.euc +++ b/runtime/tutor/tutor.ko.euc @@ -551,7 +551,7 @@ cw ܾ ġȯϴ Ӹ ƴ϶, ֵ Ѵٴ Ϳ ** Ϻθ Ϸ, :#,# w FILENAME Ͻʽÿ. ** - 1. ٽ ѹ, :!dir ̳ !ls ԷϿ 丮 ƿ + 1. ٽ ѹ, :!dir ̳ :!ls ԷϿ 丮 ƿ TEST ̸ մϴ. 2. Ŀ ó ű , Ctrl-g ԷϿ ٹȣ diff --git a/runtime/tutor/tutor.ko.utf-8 b/runtime/tutor/tutor.ko.utf-8 index 4498c9f6d1..f19ce7539e 100644 --- a/runtime/tutor/tutor.ko.utf-8 +++ b/runtime/tutor/tutor.ko.utf-8 @@ -551,7 +551,7 @@ cw 는 단어를 치환하는 것 뿐만 아니라, 내용을 삽입할 수 있 ** 파일의 일부를 저장하려면, :#,# w FILENAME 하십시오. ** - 1. 다시 한번, :!dir 이나 !ls 를 입력하여 디렉토리의 목록을 받아온 후 + 1. 다시 한번, :!dir 이나 :!ls 를 입력하여 디렉토리의 목록을 받아온 후 TEST 같은 적합한 이름을 선택합니다. 2. 커서를 이 페이지의 처음으로 옮긴 후, Ctrl-g 를 입력하여 그 줄의 줄번호를 diff --git a/runtime/tutor/tutor.nb b/runtime/tutor/tutor.nb index 17178df785..2f1d14c290 100644 --- a/runtime/tutor/tutor.nb +++ b/runtime/tutor/tutor.nb @@ -658,7 +658,7 @@ Merk: Hvis du n hadde avsluttet Vim og startet p nytt igjen med vim TEST, 4. Trykk w TEST , der TEST er et filnavn som ikke finnes enda. Kontroller at du ser :'<,'>w TEST fr du trykker Enter. - 5. Vim vil skrive de valgte linjene til filen TEST. Bruk :!dir eller !ls + 5. Vim vil skrive de valgte linjene til filen TEST. Bruk :!dir eller :!ls for se den. Ikke slett den enda! Vi vil bruke den i neste leksjon. MERK: Ved trykke v startes visuelt valg. Du kan flytte markren rundt for diff --git a/runtime/tutor/tutor.nb.utf-8 b/runtime/tutor/tutor.nb.utf-8 index a7826b7830..f9d49c2a24 100644 --- a/runtime/tutor/tutor.nb.utf-8 +++ b/runtime/tutor/tutor.nb.utf-8 @@ -658,7 +658,7 @@ Merk: Hvis du nå hadde avsluttet Vim og startet på nytt igjen med «vim TEST» 4. Trykk w TEST , der TEST er et filnavn som ikke finnes enda. Kontroller at du ser :'<,'>w TEST før du trykker Enter. - 5. Vim vil skrive de valgte linjene til filen TEST. Bruk :!dir eller !ls + 5. Vim vil skrive de valgte linjene til filen TEST. Bruk :!dir eller :!ls for å se den. Ikke slett den enda! Vi vil bruke den i neste leksjon. MERK: Ved å trykke v startes visuelt valg. Du kan flytte markøren rundt for diff --git a/runtime/tutor/tutor.no b/runtime/tutor/tutor.no index 17178df785..2f1d14c290 100644 --- a/runtime/tutor/tutor.no +++ b/runtime/tutor/tutor.no @@ -658,7 +658,7 @@ Merk: Hvis du n hadde avsluttet Vim og startet p nytt igjen med vim TEST, 4. Trykk w TEST , der TEST er et filnavn som ikke finnes enda. Kontroller at du ser :'<,'>w TEST fr du trykker Enter. - 5. Vim vil skrive de valgte linjene til filen TEST. Bruk :!dir eller !ls + 5. Vim vil skrive de valgte linjene til filen TEST. Bruk :!dir eller :!ls for se den. Ikke slett den enda! Vi vil bruke den i neste leksjon. MERK: Ved trykke v startes visuelt valg. Du kan flytte markren rundt for diff --git a/runtime/tutor/tutor.no.utf-8 b/runtime/tutor/tutor.no.utf-8 index a7826b7830..f9d49c2a24 100644 --- a/runtime/tutor/tutor.no.utf-8 +++ b/runtime/tutor/tutor.no.utf-8 @@ -658,7 +658,7 @@ Merk: Hvis du nå hadde avsluttet Vim og startet på nytt igjen med «vim TEST» 4. Trykk w TEST , der TEST er et filnavn som ikke finnes enda. Kontroller at du ser :'<,'>w TEST før du trykker Enter. - 5. Vim vil skrive de valgte linjene til filen TEST. Bruk :!dir eller !ls + 5. Vim vil skrive de valgte linjene til filen TEST. Bruk :!dir eller :!ls for å se den. Ikke slett den enda! Vi vil bruke den i neste leksjon. MERK: Ved å trykke v startes visuelt valg. Du kan flytte markøren rundt for diff --git a/runtime/tutor/tutor.sk b/runtime/tutor/tutor.sk index 2291aad61d..bae139837a 100644 --- a/runtime/tutor/tutor.sk +++ b/runtime/tutor/tutor.sk @@ -671,7 +671,7 @@ Poznmka: e ak ukon prcu s editorom Vim a znovu ho spust prkazom 4. Nap w TEST , kde TEST je meno sboru, ktor zatial neexistuje. Skontroluj, e vid :'<,'>w TEST predtm ne stla Enter. - 5. Vim zape oznaen riadky do sboru TEST. Poui :!dir alebo !ls + 5. Vim zape oznaen riadky do sboru TEST. Poui :!dir alebo :!ls pre overenie. Zatial ho ete nema! Pouijeme ho v alej lekcii. POZNMKA: Stlaenm klvesy v sa spust vizulne oznaovanie. diff --git a/runtime/tutor/tutor.sk.cp1250 b/runtime/tutor/tutor.sk.cp1250 index f32c9b12a3..c4e7b3d3ea 100644 --- a/runtime/tutor/tutor.sk.cp1250 +++ b/runtime/tutor/tutor.sk.cp1250 @@ -671,7 +671,7 @@ Poznmka: e ak ukon prcu s editorom Vim a znovu ho spust prkazom 4. Nap w TEST , kde TEST je meno sboru, ktor zatial neexistuje. Skontroluj, e vid :'<,'>w TEST predtm ne stla Enter. - 5. Vim zape oznaen riadky do sboru TEST. Poui :!dir alebo !ls + 5. Vim zape oznaen riadky do sboru TEST. Poui :!dir alebo :!ls pre overenie. Zatial ho ete nema! Pouijeme ho v alej lekcii. POZNMKA: Stlaenm klvesy v sa spust vizulne oznaovanie. diff --git a/runtime/tutor/tutor.sk.utf-8 b/runtime/tutor/tutor.sk.utf-8 index c4e0c4f5d8..51c5b4f181 100644 --- a/runtime/tutor/tutor.sk.utf-8 +++ b/runtime/tutor/tutor.sk.utf-8 @@ -671,7 +671,7 @@ Poznámka: že ak ukončíš prácu s editorom Vim a znovu ho spustíš príkazo 4. Napíš w TEST , kde TEST je meno súboru, ktorý zatial neexistuje. Skontroluj, e vidíš :'<,'>w TEST predtým než stlačíš Enter. - 5. Vim zapíše označené riadky do súboru TEST. Použi :!dir alebo !ls + 5. Vim zapíše označené riadky do súboru TEST. Použi :!dir alebo :!ls pre overenie. Zatial ho ešte nemaž! Použijeme ho v ďalšej lekcii. POZNÁMKA: Stlačením klávesy v sa spustí vizuálne označovanie. diff --git a/runtime/tutor/tutor.utf-8 b/runtime/tutor/tutor.utf-8 index daf42b6bb2..da28a15313 100644 --- a/runtime/tutor/tutor.utf-8 +++ b/runtime/tutor/tutor.utf-8 @@ -658,7 +658,7 @@ NOTE: If you were to exit Vim and start it again with vim TEST , the file 4. Type w TEST , where TEST is a filename that does not exist yet. Verify that you see :'<,'>w TEST before you press <ENTER>. - 5. Vim will write the selected lines to the file TEST. Use :!dir or !ls + 5. Vim will write the selected lines to the file TEST. Use :!dir or :!ls to see it. Do not remove it yet! We will use it in the next lesson. NOTE: Pressing v starts Visual selection. You can move the cursor around diff --git a/runtime/tutor/tutor.zh.euc b/runtime/tutor/tutor.zh.euc index 7f80f690b9..df59c32089 100644 --- a/runtime/tutor/tutor.zh.euc +++ b/runtime/tutor/tutor.zh.euc @@ -1,30 +1,32 @@ =============================================================================== -= ӭ V I M 汾 1.5 = += ӭ V I M 汾 1.7 = =============================================================================== - vim һкܶĹܷdzǿı༭ƪڱ̵̳ + + Vim һкܶĹܷdzǿı༭ƪڱ̵̳ Ͳϸˡ̵̳ĿǽһЩҪĻպ - Щܹvimһͨõܱ༭ʹˡ + Щܹؽ Vim һͨñ༭ʹˡ ɱ̵̳ݴԼҪ25-30ӣȡѵʱ䡣 + ע⣺ ÿһڵıġƼƱĵһȻڸ ѵ(ͨ"vimtutor"̵̳ģôľѾǸ) - мһñ̵̳˼·ʹнѧϰġҲ˵Ҫͨ + мһ㣺̵̳˼·ʹнѧϰġҲ˵Ҫͨ ִѧϰDZȷ÷ֻĶô ܿЩģ ˣȷShift-Lock(Сд)ûа£Ȼ - ĸ j 㹻Ĵƶֱ꣬һڵܹȫĻ + ĸ j 㹻ƶֱ꣬һڵܹȫĻ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - һһڡƶ + һһڣƶ - Ҫƶ꣬˵ֱ hjkl + ** Ҫƶ꣬˵ֱ hjkl ** ^ - k ʾ h ļλߣÿΰ¾ͻƶ + k ʾ h ļλߣÿΰ¾ͻƶ < h l > l ļλұߣÿΰ¾ͻƶ j j һ֧˷µļͷ v @@ -35,43 +37,38 @@ ---> ӦѾѧƶһɡ - 3. ʹмƶڶ + 3. ʹмƶһڶڡ -ʾȷµĸ밴<ESC>ص(Normal)ģʽ +ʾȷµĸ밴<ESC>ص(Normal)ģʽ ȻٴδӼҪ -ʾùӦҲġʹhjklϰܹ֮ - ĻĴƶˡ +ʾӦҲġʹhjklϰܹ֮ + ĻĴƶꡣ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - һڶڡVIMĽ˳ - + һڶڣVIMĽ˳ - !! رʾþĶһڵݣȻִ - 1. 밴<ESC>(Ϊȷģʽ) + !! رʾĶһڵݣȻִ - 2. Ȼ :q! <س> + 1. <ESC>(Ϊȷģʽ) ----> ַʽ˳༭ᱣ༭ĸĶ - 뱣˳ - :wq <س> + 2. Ȼ룺 :q! <س> + ַʽ˳༭ᶪ༭ĸĶ - 3. ʾܹص̵̳Ǿǡ + 3. ʾܹص̵̳Ǿǣ + vimtutor <س> - vimtutor <س> + 4. ѾμסЩĻӲ1ִе3˳Ȼ + ٴν༭ - ͨҲַʽ +ʾ :q! <س> ᶪκθĶ֮ѧαĶļ - vim tutor <س> + 5. Ƶһڡ ----> 'vim' ʾvim༭ 'tutor'Ҫ༭ļ - - 4. ѾμסЩĻӲ1ִе3˳Ȼ - ٴν༭ŽƶһǵĽ̳̽⡣ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - һڡı༭֮ɾ + һڣı༭֮ɾ ** (Normal)ģʽ£ x ɾλõַ** @@ -86,89 +83,130 @@ ---> The ccow jumpedd ovverr thhe mooon. - 5. ˣѾˣһǵһĽڡ + 5. ˣѾˣǵһĽڡ -رʾ̳ʱҪǿм䡣סһʹѧϰ +رʾ̳ʱҪǿм䡣סһ㣺ʹѧϰ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - һĽڡı༭֮ + һĽڣı༭֮ ** ģʽ£ i ı** 1. 뽫ƶ ---> ĵһС - 2. ΪʹõһͬڵڶУ뽫ıһַ + 2. ΪʹõһͬڵڶУ뽫ıһַ λá 3. Ȼ i Ҫıַ - 4. ıϣ밴 <ESC> ģʽ + 4. ÿϺ밴 <ESC> ģʽ ظ24Աӡ ---> There is text misng this . ---> There is some text missing from this line. - 5. ıѾ⣬ĶСᡣ + 5. ıѾ⣬Ķĵһڡ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - һС + һڣı༭֮ - 1. ĻıеƶȿüͷҲʹ hjkl ĸ - h () j () k () l () + ** A ı ** + + 1. ƶ굽һ ---> һС + һеĸַϲҪ + + 2. A Ҫݡ + + 3. ıϺ <ESC> صģʽ + + 4. ƶ굽ڶ ---> һСظ2Ͳ3Ըӡ + +---> There is some text missing from th + There is some text missing from this line. +---> There is also some text miss + There is also some text missing here. + + 5. ıеʱѧϰһڡ - 2. vim༭(ʾ)vim ļ <س> +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + һڣ༭ļ + + ** ʹ :wq Աļ˳ ** + + رʾִ²֮ǰȶСڣ + + 1. ڵһڶ˳̳̣ :q! + ߣԷһնˣִ² + + 2. shell ʾ vim tutor <س> + 'vim' Vim ༭'tutor'ϣ༭ļ֡ + ʹһԸĶļ + + 3. ʹǰĽ̳ѧɾı + + 4. Ķļ˳ VimЩ :wq <س> - 3. ˳vim༭ġ + 5. ڲ1Ѿ˳ vimtutor vimtutor ƶСһڡ - <ESC> :q! <س> + 6. Ķϲ裬Ūǵ壬Ȼʵнϰ + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + һС + + + 1. ĻıеƶȿüͷҲʹ hjkl ĸ |