From: Bram Moolenaar Date: Mon, 20 Feb 2006 21:37:40 +0000 (+0000) Subject: updated for version 7.0202 X-Git-Tag: v7.0202 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=faa959a8700219bd1726943cbb956001b5f737e4;p=vim updated for version 7.0202 --- diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index 2ca301ba3..4899648bf 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1,4 +1,4 @@ -*autocmd.txt* For Vim version 7.0aa. Last change: 2006 Feb 18 +*autocmd.txt* For Vim version 7.0aa. Last change: 2006 Feb 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -284,8 +284,8 @@ Name triggered by ~ |WinEnter| after entering another window |WinLeave| before leaving a window -|TabEnterPost| after entering another tab page -|TabLeavePre| before leaving a tab page +|TabEnter| after entering another tab page +|TabLeave| before leaving a tab page |CmdwinEnter| after entering the command-line window |CmdwinLeave| before leaving the command-line window @@ -706,14 +706,14 @@ Syntax When the 'syntax' option has been set. where this option was set, and for the new value of 'syntax'. See |:syn-on|. - *TabEnterPost* -TabEnterPost Just after entering a tab page. |tab-page| + *TabEnter* +TabEnter Just after entering a tab page. |tab-page| Before triggering the WinEnter and BufEnter events. - *TabLeavePre* -TabLeavePre Just before leaving a tab page. |tab-page| - BufLeave and WinLeave events will have been - triggered first. + *TabLeave* +TabLeave Just before leaving a tab page. |tab-page| + A WinLeave event will have been triggered + first. *TermChanged* TermChanged After the value of 'term' has changed. Useful for re-loading the syntax file to update the diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 9bad529eb..474f86332 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.0aa. Last change: 2006 Feb 18 +*eval.txt* For Vim version 7.0aa. Last change: 2006 Feb 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1690,8 +1690,11 @@ synIDattr( {synID}, {what} [, {mode}]) String attribute {what} of syntax ID {synID} synIDtrans( {synID}) Number translated syntax ID of {synID} system( {expr} [, {input}]) String output of shell command/filter {expr} -tabpage( [{expr}]) Number number of current tab page -taglist( {expr}) List list of tags matching {expr} +tabpagebuflist( [{arg}]) List list of buffer numbers in tab page +tabpagenr( [{arg}]) Number number of current or last tab page +tabpagewinnr( {tabarg}[, {arg}]) + Number number of current window in tab page +taglist( {expr}) List list of tags matching {expr} tagfiles() List tags files used tempname() String name for a temporary file tolower( {expr}) String the String {expr} switched to lowercase @@ -3861,10 +3864,12 @@ searchpair({start}, {middle}, {end} [, {flags} [, {skip}]]) Search for the match of a nested start-end pair. This can be used to find the "endif" that matches an "if", while other if/endif pairs in between are ignored. - The search starts at the cursor. If a match is found, the - cursor is positioned at it and the line number is returned. - If no match is found 0 or -1 is returned and the cursor - doesn't move. No error message is given. + The search starts at the cursor. The default is to search + forward, include 'b' in {flags} to search backward. + If a match is found, the cursor is positioned at it and the + line number is returned. If no match is found 0 or -1 is + returned and the cursor doesn't move. No error message is + given. {start}, {middle} and {end} are patterns, see |pattern|. They must not contain \( \) pairs. Use of \%( \) is allowed. When @@ -4448,7 +4453,21 @@ system({expr} [, {input}]) *system()* *E677* Use |:checktime| to force a check. -tabpagenr([{arg}]) *tabpagenr()* +tabpagebuflist([{arg}]) *tabpagebuflist()* + The result is a List, where each item is the number of the + buffer associated with each window in the current tab page. + {arg} specifies the number of tab page to be used. When + omitted the current tab page is used. + When {arg} is invalid the number zero is returned. + To get a list of all buffers in all tabs use this: > + tablist = [] + for i in range(tabpagenr('$')) + call extend(tablist, tabpagebuflist(i + 1)) + endfor +< Note that a buffer may appear in more than one window. + + +tabpagenr([{arg}]) *tabpagenr()* The result is a Number, which is the number of the current tab page. The first tab page has number 1. When the optional argument is "$", the number of the last tab @@ -4456,6 +4475,19 @@ tabpagenr([{arg}]) *tabpagenr()* The number can be used with the |:tab| command. +tabpagewinnr({tabarg}, [{arg}]) *tabpagewinnr()* + Like |winnr()| but for tab page {arg}. + {tabarg} specifies the number of tab page to be used. + {arg} is used like with |winnr()|: + - When omitted the current window number is returned. This is + the window which will be used when going to this tab page. + - When "$" the number of windows is returned. + - When "#" the previous window nr is returned. + Useful examples: > + tabpagewinnr(1) " current window of tab page 1 + tabpagewinnr(4, '$') " number of windows in tab page 4 +< When {tabarg} is invalid zero is returned. + taglist({expr}) *taglist()* Returns a list of tags matching the regular expression {expr}. Each list item is a dictionary with at least the following diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index c17074c2d..53b9899a6 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.0aa. Last change: 2006 Feb 18 +*options.txt* For Vim version 7.0aa. Last change: 2006 Feb 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -4614,7 +4614,7 @@ A jump table for the options with a short description can be found at |Q_op|. {only available when compiled with the |+linebreak| feature} Minimal number of columns to use for the line number. Only relevant - when the 'number' option is set. + when the 'number' option is set or printint lines with a line number. Since one space is always between the number and the text, there is one less character for the number itself. The value is the minimum width. A bigger width is used when needed to @@ -5680,6 +5680,21 @@ A jump table for the options with a short description can be found at |Q_op|. NOTE: This option is set to the Vi default value when 'compatible' is set and to the Vim default value when 'compatible' is reset. + *'showtabline'* *'stal'* +'showtabline' 'stal' number (default 1) + global + {not in Vi} + {not available when compiled without the +windows + feature} + The value of this option specifies when the line with tab page labels + will be displayed: + 0: never + 1: only if there are at least two tab pages + 2: always + This is both for the GUI and non-GUI implementation of the tab pages + line. + See |tab-page| for more information about tab pages. + *'sidescroll'* *'ss'* 'sidescroll' 'ss' number (default 0) global @@ -6235,17 +6250,25 @@ A jump table for the options with a short description can be found at |Q_op|. Only normal file name characters can be used, "/\*?[|<>" are illegal. *'tabline'* *'tal'* -'tabline' 'tal' number (default 1) +'tabline' 'tal' string (default empty) global {not in Vi} {not available when compiled without the +windows feature} - The value of this option specifies when the line with tab page labels - will be displayed: - 0: never - 1: only if there are at least two tab pages - 2: always - |tab-page| + When nonempty, this option determines the content of the tab pages + line at the top of the Vim window. When empty Vim will use a default + tab pages line. |tab-page| + + The tab pages line only appears as specified with the 'showtabline' + option and only when there is no GUI implementation for tabs. + + The value is evaluated like with 'statusline'. You can use + |tabpagenr()|, |tabpagewinnr()| and |tabpagebuflist()| to figure out + the text to be displayed. + + Keep in mind that only one of the tab pages is the current one, others + are invisible and you can't jump to their windows. + *'tabstop'* *'ts'* 'tabstop' 'ts' number (default 8) diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index ff3b7f9ad..d839e251c 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 7.0aa. Last change: 2006 Feb 16 +*syntax.txt* For Vim version 7.0aa. Last change: 2006 Feb 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -4020,6 +4020,12 @@ StatusLine status line of current window StatusLineNC status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. + *hl-TabLine* +TabLine tab pages line, not active tab page label + *hl-TabLineFill* +TabLineFill tab pages line, where there are no labels + *hl-TabLineSel* +TabLineSel tab pages line, active tab page label *hl-Title* Title titles for output from ":set all", ":autocmd" etc. *hl-Visual* diff --git a/runtime/doc/tags b/runtime/doc/tags index 514ca293d..517c4dd76 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -718,6 +718,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* 'showfulltag' options.txt /*'showfulltag'* 'showmatch' options.txt /*'showmatch'* 'showmode' options.txt /*'showmode'* +'showtabline' options.txt /*'showtabline'* 'shq' options.txt /*'shq'* 'si' options.txt /*'si'* 'sidescroll' options.txt /*'sidescroll'* @@ -758,6 +759,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* 'ssop' options.txt /*'ssop'* 'st' options.txt /*'st'* 'sta' options.txt /*'sta'* +'stal' options.txt /*'stal'* 'startofline' options.txt /*'startofline'* 'statusline' options.txt /*'statusline'* 'stl' options.txt /*'stl'* @@ -2646,6 +2648,10 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* :tabclose tabpage.txt /*:tabclose* :tabe tabpage.txt /*:tabe* :tabedit tabpage.txt /*:tabedit* +:tabf tabpage.txt /*:tabf* +:tabfind tabpage.txt /*:tabfind* +:tabn tabpage.txt /*:tabn* +:tabnew tabpage.txt /*:tabnew* :tabo tabpage.txt /*:tabo* :tabonly tabpage.txt /*:tabonly* :tabs tabpage.txt /*:tabs* @@ -4098,8 +4104,8 @@ TCL if_tcl.txt /*TCL* TERM starting.txt /*TERM* TTpro-telnet syntax.txt /*TTpro-telnet* Tab intro.txt /*Tab* -TabEnterPost autocmd.txt /*TabEnterPost* -TabLeavePre autocmd.txt /*TabLeavePre* +TabEnter autocmd.txt /*TabEnter* +TabLeave autocmd.txt /*TabLeave* Tcl if_tcl.txt /*Tcl* TermChanged autocmd.txt /*TermChanged* TermResponse autocmd.txt /*TermResponse* @@ -5515,6 +5521,9 @@ hl-SpellLocal syntax.txt /*hl-SpellLocal* hl-SpellRare syntax.txt /*hl-SpellRare* hl-StatusLine syntax.txt /*hl-StatusLine* hl-StatusLineNC syntax.txt /*hl-StatusLineNC* +hl-TabLine syntax.txt /*hl-TabLine* +hl-TabLineFill syntax.txt /*hl-TabLineFill* +hl-TabLineSel syntax.txt /*hl-TabLineSel* hl-Title syntax.txt /*hl-Title* hl-Tooltip syntax.txt /*hl-Tooltip* hl-User1 syntax.txt /*hl-User1* @@ -6949,7 +6958,9 @@ tab-page-intro tabpage.txt /*tab-page-intro* tab-page-other tabpage.txt /*tab-page-other* tabpage tabpage.txt /*tabpage* tabpage.txt tabpage.txt /*tabpage.txt* +tabpagebuflist() eval.txt /*tabpagebuflist()* tabpagenr() eval.txt /*tabpagenr()* +tabpagewinnr() eval.txt /*tabpagewinnr()* tag tagsrch.txt /*tag* tag-! tagsrch.txt /*tag-!* tag-any-white tagsrch.txt /*tag-any-white* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 4c65d1df9..94218ec27 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.0aa. Last change: 2006 Feb 18 +*todo.txt* For Vim version 7.0aa. Last change: 2006 Feb 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -30,6 +30,50 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. *known-bugs* -------------------- Known bugs and current work ----------------------- +'tabline' documentation with an example; esp for the highlighting + +P_INSECURE should be remembered for local option values separately. + +Completion: and don't insert completion, and +shouldn't either. + +Completion: case sensitiveness when typing BS: make it an option? + +Completion: When back at the original word behave like after BS. + +Completion: When to get out of the BS state when the user keeps on typing? + +TabLineMod, TabLineModSel hl when a buffer is modified in a tab. +Command(s) to reorder tabs? ":tabmove N". +Open new tab by double click in tab line. +"gT", ":tpNext" and ":tpprev" to go to previous tab? +":tab" -> ":tpnext". +":tab" or ":tabpage" modifier to open new window in new tab. + E.g., ":tab help gt" + Keep a few commands as shortcuts: + :tpnew :tab new + :tpedit - + :tpclose :tab close + :tponly :tab only + :tpnext - + :tpprevious - + :tpNext - + :tplast - + :tpfirst - + ":tab!" to open it at the end, ":0tab" to open at the start. + ":tab split" opens tab with window same as current window. + ":tpsplit" would split the tab with all its windows. +Option to put tab line at the left or right? Need an option to specify its +witdh. It's like a separate window with ":tabs" output. + :tabdo ":tabdo windo cmd" should also work + +Add an argument to search functions to stop at a certain line number. + search('{', 'b', line('w0')) + search('{', '', line('w$')) +Also start at a specified position? + +undo could remember the '< and '> marks. + Support WINDOW TABS. Works like several pages, each with their own split windows. Let's call them "tab pages". - line at top of frame with tabs. @@ -103,6 +147,7 @@ closing it, executing the command and re-opening it (at the same position). all. (Gautam Iyer) Mac unicode patch (Da Woon Jung): +- configuration option for platform: i386, ppc or both. - selecting proportional font breaks display - UTF-8 text causes display problems. Font replacement causes this. - Command-key mappings do not work. (Alan Schmitt) diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index a7cb74348..05908d076 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -1,4 +1,4 @@ -*various.txt* For Vim version 7.0aa. Last change: 2006 Jan 08 +*various.txt* For Vim version 7.0aa. Last change: 2006 Feb 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -94,7 +94,8 @@ g8 Print the hex values of the bytes used in the *:nu* *:number* :[range]nu[mber] [count] [flags] Same as :print, but precede each line with its line - number. (See also 'highlight' option). + number. (See also 'highlight' and 'numberwidth' + option). See |ex-flags| for [flags]. *:#* diff --git a/runtime/syntax/colortest.vim b/runtime/syntax/colortest.vim index 0b59fa180..377eba98f 100644 --- a/runtime/syntax/colortest.vim +++ b/runtime/syntax/colortest.vim @@ -1,7 +1,7 @@ " Vim script for testing colors " Maintainer: Bram Moolenaar " Contributors: Rafael Garcia-Suarez, Charles Campbell -" Last Change: 2006 Feb 16 +" Last Change: 2006 Feb 20 " edit this file, then do ":source %", and check if the colors match @@ -54,11 +54,12 @@ " Open this file in a window if it isn't edited yet. " Use the current window if it's empty. -if &mod || line('$') != 1 || getline(1) != '' - new -endif if expand('%:p') != expand(':p') - exe "edit " . expand('') + if &mod || line('$') != 1 || getline(1) != '' + exe "new " . expand('') + else + exe "edit " . expand('') + endif endif syn clear diff --git a/runtime/tutor/tutor.ja.euc b/runtime/tutor/tutor.ja.euc index 02753d75d..f043e42f2 100644 --- a/runtime/tutor/tutor.ja.euc +++ b/runtime/tutor/tutor.ja.euc @@ -1,25 +1,26 @@ =============================================================================== -= V I M ¶µ ËÜ (¥Á¥å¡¼¥È¥ê¥¢¥ë) ¤Ø ¤è ¤¦ ¤³ ¤½ - Version 1.5 = += V I M ¶µ ËÜ (¥Á¥å¡¼¥È¥ê¥¢¥ë) ¤Ø ¤è ¤¦ ¤³ ¤½ - Version 1.7 = =============================================================================== - Vim ¤Ï¡¢¤³¤Î¥Á¥å¡¼¥È¥ê¥¢¥ë¤ÇÀâÌÀ¤¹¤ë¤Ë¤Ï¿¤¹¤®¤ëÄø¤Î¥³¥Þ¥ó¥É¤òÈ÷¤¨¤¿ - Èó¾ï¤Ë¶¯ÎϤʥ¨¥Ç¥£¥¿¡¼¤Ç¤¹¡£¤³¤Î¥Á¥å¡¼¥È¥ê¥¢¥ë¤Ï¡¢¤¢¤Ê¤¿¤¬ Vim - ¤òËüǽ¥¨¥Ç¥£¥¿¡¼¤È¤·¤Æ»È¤¤¤³¤Ê¤»¤ë¤è¤¦¤Ë¤Ê¤ë¤Î¤Ë½½Ê¬¤Ê¥³¥Þ¥ó¥É¤Ë¤Ä¤¤¤Æ - ÀâÌÀ¤ò¤¹¤ë¤è¤¦¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£ + Vim ¤Ï¡¢¤³¤Î¥Á¥å¡¼¥È¥ê¥¢¥ë¤ÇÀâÌÀ¤¹¤ë¤Ë¤Ï¿¤¹¤®¤ëÄø¤Î¥³¥Þ¥ó¥É¤òÈ÷¤¨¤¿Èó¾ï + ¤Ë¶¯ÎϤʥ¨¥Ç¥£¥¿¡¼¤Ç¤¹¡£¤³¤Î¥Á¥å¡¼¥È¥ê¥¢¥ë¤Ï¡¢¤¢¤Ê¤¿¤¬ Vim ¤òËüǽ¥¨¥Ç¥£ + ¥¿¡¼¤È¤·¤Æ»È¤¤¤³¤Ê¤»¤ë¤è¤¦¤Ë¤Ê¤ë¤Î¤Ë½½Ê¬¤Ê¥³¥Þ¥ó¥É¤Ë¤Ä¤¤¤ÆÀâÌÀ¤ò¤¹¤ë¤è¤¦ + ¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£ - ¥Á¥å¡¼¥È¥ê¥¢¥ë¤ò´°Î»¤¹¤ë¤Î¤ËɬÍפʻþ´Ö¤Ï¡¢³Ð¤¨¤¿¥³¥Þ¥ó¥É¤ò»î¤¹¤Î¤Ë¤É¤ì - ¤À¤±»þ´Ö¤ò»È¤¦¤Î¤«¤Ë¤â¤è¤ê¤Þ¤¹¤¬¡¢¤ª¤è¤½25¡Á30ʬ¤Ç¤¹¡£ + ¥Á¥å¡¼¥È¥ê¥¢¥ë¤ò´°Î»¤¹¤ë¤Î¤ËɬÍפʻþ´Ö¤Ï¡¢³Ð¤¨¤¿¥³¥Þ¥ó¥É¤ò»î¤¹¤Î¤Ë¤É¤ì¤À + ¤±»þ´Ö¤ò»È¤¦¤Î¤«¤Ë¤â¤è¤ê¤Þ¤¹¤¬¡¢¤ª¤è¤½25¤«¤é30ʬ¤Ç¤¹¡£ - ³Ø¤Ö¥³¥Þ¥ó¥É¤Ë¤Ï¤³¤Îʸ¾Ï¤òÊѹ¹¤¹¤ë¤â¤Î¤â¤¢¤ê¤Þ¤¹¡£Îý½¬¤ò»Ï¤á¤ëÁ°¤Ë¥³ - ¥Ô¡¼¤òºîÀ®¤·¤Þ¤·¤ç¤¦("vimtutor"¤·¤¿¤Ê¤é¤Ð¡¢´û¤Ë¥³¥Ô¡¼¤µ¤ì¤Æ¤¤¤Þ¤¹)¡£ + ATTENTION: + °Ê²¼¤ÎÎý½¬ÍÑ¥³¥Þ¥ó¥É¤Ë¤Ï¤³¤Îʸ¾Ï¤òÊѹ¹¤¹¤ë¤â¤Î¤â¤¢¤ê¤Þ¤¹¡£Îý½¬¤ò»Ï¤á¤ëÁ° + ¤Ë¥³¥Ô¡¼¤òºîÀ®¤·¤Þ¤·¤ç¤¦("vimtutor"¤·¤¿¤Ê¤é¤Ð¡¢´û¤Ë¥³¥Ô¡¼¤µ¤ì¤Æ¤¤¤Þ¤¹)¡£ - ¤³¤Î¥Á¥å¡¼¥È¥ê¥¢¥ë¤¬¡¢»È¤¦¤³¤È¤Ç³Ð¤¨¤é¤ì¤ë»ÅÁȤߤˤʤäƤ¤¤ë¤³¤È¤ò¡¢¿´ - ¤·¤Æ¤ª¤«¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£Àµ¤·¤¯³Ø½¬¤¹¤ë¤Ë¤Ï¥³¥Þ¥ó¥É¤ò¼ÂºÝ¤Ë»î¤µ¤Ê¤± - ¤ì¤Ð¤Ê¤é¤Ê¤¤¤Î¤Ç¤¹¡£Ê¸¾Ï¤òÆɤó¤À¤À¤±¤Ê¤é¤Ð¡¢¤­¤Ã¤È˺¤ì¤Æ¤·¤Þ¤¤¤Þ¤¹!¡£ + ¤³¤Î¥Á¥å¡¼¥È¥ê¥¢¥ë¤¬¡¢»È¤¦¤³¤È¤Ç³Ð¤¨¤é¤ì¤ë»ÅÁȤߤˤʤäƤ¤¤ë¤³¤È¤ò¡¢¿´¤· + ¤Æ¤ª¤«¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£Àµ¤·¤¯³Ø½¬¤¹¤ë¤Ë¤Ï¥³¥Þ¥ó¥É¤ò¼ÂºÝ¤Ë»î¤µ¤Ê¤±¤ì¤Ð + ¤Ê¤é¤Ê¤¤¤Î¤Ç¤¹¡£Ê¸¾Ï¤òÆɤó¤À¤À¤±¤Ê¤é¤Ð¡¢¤­¤Ã¤È˺¤ì¤Æ¤·¤Þ¤¤¤Þ¤¹!¡£ - ¤µ¤¡¡¢Caps¥í¥Ã¥¯(Shift-Lock)¥­¡¼¤¬²¡¤µ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤ò³Îǧ¤·¤¿¸å¡¢ - ²èÌ̤˥ì¥Ã¥¹¥ó1.1 ¤¬Á´Éôɽ¼¨¤µ¤ì¤ë¤È¤³¤í¤Þ¤Ç¡¢j ¥­¡¼¤ò²¡¤·¤Æ¥«¡¼¥½¥ë¤ò - °ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ + ¤µ¤¡¡¢Caps¥í¥Ã¥¯(Shift-Lock)¥­¡¼¤¬²¡¤µ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤ò³Îǧ¤·¤¿¸å¡¢²èÌÌ¤Ë + ¥ì¥Ã¥¹¥ó1.1 ¤¬Á´Éôɽ¼¨¤µ¤ì¤ë¤È¤³¤í¤Þ¤Ç¡¢j ¥­¡¼¤ò²¡¤·¤Æ¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ + ¤·¤ç¤¦¡£ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ¥ì¥Ã¥¹¥ó 1.1: ¥«¡¼¥½¥ë¤Î°ÜÆ° @@ -33,15 +34,15 @@ 1. °ÜÆ°¤Ë´·¤ì¤ë¤Þ¤Ç¡¢¥¹¥¯¥ê¡¼¥ó¤Ç¥«¡¼¥½¥ë°ÜÆ°¤µ¤»¤Þ¤·¤ç¤¦¡£ 2. ²¼¤Ø¤Î¥­¡¼(j)¤ò²¡¤·¤Ä¤Å¤±¤ë¤È¡¢Ï¢Â³¤·¤Æ°ÜÆ°¤Ç¤­¤Þ¤¹¡£ ----> ¤³¤ì¤Ç¼¡¤Î¥ì¥Ã¥¹¥ó¤Ë°ÜÆ°¤¹¤ëÊýË¡¤¬¤ï¤«¤ê¤Þ¤·¤¿¤Í¡£ + ¤³¤ì¤Ç¼¡¤Î¥ì¥Ã¥¹¥ó¤Ë°ÜÆ°¤¹¤ëÊýË¡¤¬¤ï¤«¤ê¤Þ¤·¤¿¤Í¡£ 3. ²¼¤Ø¤Î¥­¡¼¤ò»È¤Ã¤Æ¡¢¥ì¥Ã¥¹¥ó1.2 ¤Ë°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ -NOTE: ²¿¤ò¥¿¥¤¥×¤·¤Æ¤¤¤ë¤«È½¤é¤Ê¤¯¤Ê¤Ã¤¿¤é¡¢¤ò²¡¤·¤Æ¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ë¤·¤Þ - ¤¹¡£¤½¤ì¤«¤éÆþÎϤ·¤è¤¦¤È¤·¤Æ¤¤¤¿¥³¥Þ¥ó¥É¤òºÆÆþÎϤ·¤Þ¤·¤ç¤¦¡£ +Note: ²¿¤ò¥¿¥¤¥×¤·¤Æ¤¤¤ë¤«È½¤é¤Ê¤¯¤Ê¤Ã¤¿¤é¡¢¤ò²¡¤·¤Æ¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ë¤· + ¤Þ¤¹¡£¤½¤ì¤«¤éÆþÎϤ·¤è¤¦¤È¤·¤Æ¤¤¤¿¥³¥Þ¥ó¥É¤òºÆÆþÎϤ·¤Þ¤·¤ç¤¦¡£ -NOTE: ¥«¡¼¥½¥ë¥­¡¼¤Ç¤â°ÜÆ°¤Ç¤­¤Þ¤¹¡£¤·¤«¤· hjkl ¤ò»ÈÍѤ¹¤ë¤³¤È¤Ë°ìÅÙ´·¤ì¤Æ¤·¤Þ - ¤¨¤Ð¡¢¤Ï¤ë¤«¤Ë®¤¯°ÜÆ°¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤Ç¤·¤ç¤¦¡£ +Note: ¥«¡¼¥½¥ë¥­¡¼¤Ç¤â°ÜÆ°¤Ç¤­¤Þ¤¹¡£¤·¤«¤· hjkl ¤Ë°ìÅÙ´·¤ì¤Æ¤·¤Þ¤¨¤Ð¡¢¤Ï¤ë¤« + ¤Ë®¤¯°ÜÆ°¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤Ç¤·¤ç¤¦¡£¤¤¤ä¥Þ¥¸¤Ç! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ¥ì¥Ã¥¹¥ó 1.2: VIM ¤Îµ¯Æ°¤È½ªÎ» @@ -52,27 +53,27 @@ NOTE: 1. ¥­¡¼¤ò²¡¤·¤Þ¤·¤ç¤¦¡£(³Î¼Â¤Ë¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ë¤¹¤ë¤¿¤á) 2. ¼¡¤Î¤è¤¦¤Ë¥¿¥¤¥×: :q! + ¤³¤ì¤Ë¤è¤êÊÔ½¸¤·¤¿ÆâÍƤòÊݸ¤»¤º¤Ë¥¨¥Ç¥£¥¿¤¬½ªÎ»¤·¤Þ¤¹¡£ ----> ¤³¤ì¤Ë¤è¤êÊÔ½¸¤·¤¿ÆâÍƤòÊݸ¤»¤º¤Ë¥¨¥Ç¥£¥¿¤¬½ªÎ»¤·¤Þ¤¹¡£ - ÊÔ½¸ÆâÍƤòÊݸ¤·¤Æ½ªÎ»¤¹¤ë¤È¤­¤Ï¼¡¤Î¤è¤¦¤Ë¥¿¥¤¥×¤·¤Þ¤¹: - :wq - - 3. ¥·¥§¥ë¥×¥í¥ó¥×¥È¤«¤é¥Á¥å¡¼¥È¥ê¥¢¥ë¤ò»Ï¤á¤ë¤Ë¤Ï¥³¥Þ¥ó¥É¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£ + 3. ¥·¥§¥ë¥×¥í¥ó¥×¥È¤¬½Ð¤Æ¤­¤¿¤é¡¢¤³¤Î¥Á¥å¡¼¥È¥ê¥¢¥ë¤ò»Ï¤á¤ë°Ù¤Ë¤Ë¥³¥Þ¥ó¥É + ¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£ ¤½¤Î¥³¥Þ¥ó¥É¤Ï: vimtutor - Ä̾ï¤Ï¤³¤¦¤Ç¤·¤ç¤¦: vim tutor - ----> 'vim' ¤Ï Vim ¥¨¥Ç¥£¥¿¤Îµ¯Æ°¤ò¡¢'tutor' ¤ÏÊÔ½¸¤·¤¿¤¤¥Õ¥¡¥¤¥ë¤ò°ÕÌ£¤·¤Þ¤¹¡£ 4. ¤³¤ì¤Þ¤Ç¤Î¥¹¥Æ¥Ã¥×¤ò³Ð¤¨¼«¿®¤¬¤Ä¤¤¤¿¤Ê¤é¤Ð¡¢¥¹¥Æ¥Ã¥× 1 ¤«¤é 3 ¤Þ¤Ç¤ò¼Â - ºÝ¤Ë»î¤·¤Æ¡¢Vim ¤ò1ÅÙ½ªÎ»¤·¤Æ¤«¤éºÆ¤Óµ¯Æ°¤·¤Þ¤·¤ç¤¦¡£¤½¤ì¤«¤é¥ì¥Ã¥¹¥ó - 1.3¤Þ¤Ç¥«¡¼¥½¥ë¤ò°ÜÆ°¤µ¤»¤Þ¤·¤ç¤¦¡£ + ºÝ¤Ë»î¤·¤Æ¡¢Vim ¤ò1ÅÙ½ªÎ»¤·¤Æ¤«¤éºÆ¤Óµ¯Æ°¤·¤Þ¤·¤ç¤¦¡£ + +NOTE: :q! ¤ÏÁ´¤Æ¤ÎÊѹ¹¤òÇË´þ¤·¤Þ¤¹¡£¥ì¥Ã¥¹¥ó¤Ë¤ÆÊѹ¹¤ò¥Õ¥¡¥¤¥ë¤ËÊÝ + ¸¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤âÊÙ¶¯¤·¤Æ¤¤¤­¤Þ¤·¤ç¤¦¡£ + + 5. 1.3¤Þ¤Ç¥«¡¼¥½¥ë¤ò°ÜÆ°¤µ¤»¤Þ¤·¤ç¤¦¡£ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ¥ì¥Ã¥¹¥ó 1.3: ¥Æ¥­¥¹¥ÈÊÔ½¸ - ºï½ü ** ¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ë¤Æ¥«¡¼¥½¥ë¤Î²¼¤Îʸ»ú¤òºï½ü¤¹¤ë¤Ë¤Ï x ¤ò²¡¤·¤Þ¤¹ ** - 1. °Ê²¼¤Î ---> ¤Èµ­¤µ¤ì¤¿¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ + 1. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ 2. ´Ö°ã¤¤¤ò½¤Àµ¤¹¤ë¤¿¤á¤Ë¡¢ºï½ü¤¹¤ëºÇ½é¤Îʸ»ú¤Þ¤Ç¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤¹¡£ @@ -82,7 +83,7 @@ NOTE: ---> ¤½¤Î ¤¦¤¦¤µ¤® ¤Ï ¤Ä¤Ä¤­¤­ ¤ò ¤³¤¨¤¨¤Æ¤Æ ¤È¤Ó¤Ï¤Í¤¿¤¿ - 5. ¹Ô¤¬Àµ¤·¤¯¤Ê¤Ã¤¿¤é¡¢¥ì¥Ã¥¹¥ó 1.4 ¤Ë°Ü¤ê¤Þ¤·¤ç¤¦¡£ + 5. ¹Ô¤¬Àµ¤·¤¯¤Ê¤Ã¤¿¤é¡¢¥ì¥Ã¥¹¥ó 1.4 ¤Ø¿Ê¤ß¤Þ¤·¤ç¤¦¡£ NOTE: Á´¤Æ¤Î¥ì¥Ã¥¹¥ó¤òÄ̤¸¤Æ¡¢³Ð¤¨¤è¤¦¤È¤¹¤ë¤Î¤Ç¤Ï¤Ê¤¯¼ÂºÝ¤Ë¤ä¤Ã¤Æ¤ß¤Þ¤·¤ç¤¦¡£ @@ -95,15 +96,15 @@ NOTE: ** ¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ë¤Æ¥Æ¥­¥¹¥È¤òÁÞÆþ¤¹¤ë¤Ë¤Ï i ¤ò²¡¤·¤Þ¤¹ ** - 1. °Ê²¼¤Î ---> ¤Èµ­¤µ¤ì¤¿¤µ¤ì¤¿ºÇ½é¤Î¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ + 1. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿ºÇ½é¤Î¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ - 2. 1¹ÔÌܤò2¹ÔÌܤÈƱ¤¸Íͤˤ¹¤ë¤¿¤á¤Ë¡¢¥Æ¥­¥¹¥È¤òÁÞÆþ¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤°Ì - Ã֤μ¡¤Îʸ»ú¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤¹¡£ + 2. 1¹ÔÌܤò2¹ÔÌܤÈƱ¤¸Íͤˤ¹¤ë¤¿¤á¤Ë¡¢¥Æ¥­¥¹¥È¤òÁÞÆþ¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤°ÌÃÖ + ¤Î¼¡¤Îʸ»ú¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤¹¡£ 3. i ¥­¡¼¤ò²¡¤·¤Æ¤«¤é¡¢Äɲä¬É¬ÍפÊʸ»ú¤ò¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£ - 4. ´Ö°ã¤¤¤ò½¤Àµ¤·¤¿¤é ¤ò²¡¤·¤Æ¥³¥Þ¥ó¥É¥â¡¼¥É¤ËÌá¤ê¡¢Àµ¤·¤¤Ê¸¤Ë - ¤Ê¤ëÍͤ˥¹¥Æ¥Ã¥× 2 ¤«¤é 4 ¤ò·«¤êÊÖ¤·¤Þ¤·¤ç¤¦¡£ + 4. ´Ö°ã¤¤¤ò½¤Àµ¤·¤¿¤é ¤ò²¡¤·¤Æ¥³¥Þ¥ó¥É¥â¡¼¥É¤ËÌá¤ê¡¢Àµ¤·¤¤Ê¸¤Ë¤Ê¤ëÍÍ + ¤Ë¥¹¥Æ¥Ã¥× 2 ¤«¤é 4 ¤ò·«¤êÊÖ¤·¤Þ¤·¤ç¤¦¡£ ---> ¤³¤Î ¤Ë¤Ï ­¤ê¤Ê¤¤ ¥Æ¥­¥¹¥È ¤¢¤ë¡£ ---> ¤³¤Î ¹Ô ¤Ë¤Ï ´ö¤Ä¤« ­¤ê¤Ê¤¤ ¥Æ¥­¥¹¥È ¤¬ ¤¢¤ë¡£ @@ -112,6 +113,52 @@ NOTE: +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ¥ì¥Ã¥¹¥ó 1.5: ¥Æ¥­¥¹¥ÈÊÔ½¸ - Äɲà + + + ** ¥Æ¥­¥¹¥ÈÄɲ乤ë¤Ë¤Ï A ¤ò²¡¤·¤Þ¤·¤ç¤¦ ** + + 1. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿ºÇ½é¤Î¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ + ¥«¡¼¥½¥ë¤¬¤½¤Îʸ»ú¾å¤Ë¤¢¤Ã¤Æ¤â¤«¤Þ¤¤¤Þ¤»¤ó¡£ + + 2. Äɲä¬É¬Íפʾì½ê¤Ç A ¤ò¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£ + + 3. ¥Æ¥­¥¹¥È¤òÄɲä·½ª¤¨¤¿¤é¡¢ ¤ò²¡¤·¤Æ¥Î¡¼¥Þ¥ë¥â¡¼¥É¤ËÌá¤ê¤Þ¤·¤ç¤¦¡£ + + 4. 2¹ÔÌܤΠ---> ¤È¼¨¤µ¤ì¤¿¾ì½ê¤Ø°ÜÆ°¤·¡¢¥¹¥Æ¥Ã¥× 2 ¤«¤é 3 ·«¤êÊÖ¤·¤Æʸˡ¤ò + ½¤Àµ¤·¤Þ¤·¤ç¤¦¡£ + +---> ¤³¤³¤Ë¤Ï´Ö°ã¤Ã¤¿¥Æ¥­¥¹¥È¤¬¤¢¤ê + ¤³¤³¤Ë¤Ï´Ö°ã¤Ã¤¿¥Æ¥­¥¹¥È¤¬¤¢¤ê¤Þ¤¹¡£ +---> ¤³¤³¤Ë¤â´Ö°ã¤Ã¤¿¥Æ¥­¥¹ + ¤³¤³¤Ë¤â´Ö°ã¤Ã¤¿¥Æ¥­¥¹¥È¤¬¤¢¤ê¤Þ¤¹¡£ + + 5. ¥Æ¥­¥¹¥È¤ÎÄɲ䬷ڲ÷¤Ë¤Ê¤Ã¤Æ¤­¤¿¤é¥ì¥Ã¥¹¥ó 1.6 ¤Ø¿Ê¤ß¤Þ¤·¤ç¤¦¡£ + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ¥ì¥Ã¥¹¥ó 1.6: ¥Õ¥¡¥¤¥ë¤ÎÊÔ½¸ + + + ** ¥Õ¥¡¥¤¥ë¤òÊݸ¤·¤Æ½ªÎ»¤¹¤ë¤Ë¤Ï :wq ¤È¥¿¥¤¥×¤·¤Þ¤¹ ** + + !! NOTE: °Ê²¼¤Î¥¹¥Æ¥Ã¥×¤ò¼Â¹Ô¤¹¤ëÁ°¤Ë¡¢¤Þ¤ºÁ´ÂΤòÆɤó¤Ç¤¯¤À¤µ¤¤!! + + 1. ¥ì¥Ã¥¹¥ó 1.2 ¤Ç¤ä¤Ã¤¿¤è¤¦¤Ë :q! ¤ò¥¿¥¤¥×¤·¤Æ¡¢¤³¤Î¥Á¥å¡¼¥È¥ê¥¢¥ë¤ò½ªÎ» + ¤·¤Þ¤¹¡£ + + 2. ¥·¥§¥ë¥×¥í¥ó¥×¥È¤Ç¤³¤Î¥³¥Þ¥ó¥É¤ò¥¿¥¤¥×¤·¤Þ¤¹: vim tutor + 'vim'¤¬ Vim ¥¨¥Ç¥£¥¿¤òµ¯Æ°¤¹¤ë¥³¥Þ¥ó¥É¡¢'tutor' ¤ÏÊÔ½¸¤·¤¿¤¤¥Õ¥¡¥¤¥ë¤Î + ̾Á°¤Ç¤¹¡£Êѹ¹¤·¤Æ¤â¤è¤¤¥Õ¥¡¥¤¥ë¤ò»È¤¤¤Þ¤·¤ç¤¦¡£ + + 3. Á°¤Î¥ì¥Ã¥¹¥ó¤Ç³Ø¤ó¤À¤è¤¦¤Ë¡¢¥Æ¥­¥¹¥È¤òÁÞÆþ¡¢ºï½ü¤·¤Þ¤¹¡£ + + 4. Êѹ¹¤ò¥Õ¥¡¥¤¥ë¤ËÊݸ¤·¤Þ¤¹: :wq + + 5. vimtutor ¤òºÆÅÙµ¯Æ°¤·¡¢°Ê²¼¤ÎÍ×Ìó¤Ø¿Ê¤ß¤Þ¤·¤ç¤¦¡£ + + 6. °Ê¾å¤Î¥¹¥Æ¥Ã¥×¤òÆɤó¤ÇÍý²ò¤·¤¿¾å¤Ç¤³¤ì¤ò¼Â¹Ô¤·¤Þ¤·¤ç¤¦¡£ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ¥ì¥Ã¥¹¥ó 1 Í×Ìó @@ -127,14 +174,14 @@ NOTE: 4. ¥«¡¼¥½¥ë¤Î²¼¤Îʸ»ú¤òºï½ü¤¹¤ë¤Ë¤Ï¡¢¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ç x ¤È¥¿¥¤¥×¤·¤Þ¤¹¡£ 5. ¥«¡¼¥½¥ë¤Î°ÌÃÖ¤Ëʸ»ú¤òÁÞÆþ¤¹¤ë¤Ë¤Ï¡¢¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ç i ¤È¥¿¥¤¥×¤·¤Þ¤¹¡£ - i ¥Æ¥­¥¹¥È¤Î¥¿¥¤¥× + i ¥Æ¥­¥¹¥È¤Î¥¿¥¤¥× ¥«¡¼¥½¥ë°ÌÃÖ¤ËÄɲà + A ¥Æ¥­¥¹¥È¤ÎÄɲà ¹ÔËö¤ËÄɲà -NOTE: ¥­¡¼¤ò²¡¤¹¤È¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ë°Ü¹Ô¤·¤Þ¤¹¡£¤½¤ÎºÝ¡¢´Ö°ã¤Ã¤¿¤êÆþÎÏÅÓÃæ - ¤Î¥³¥Þ¥ó¥É¤ò¼è¤ê¾Ã¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ +NOTE: ¥­¡¼¤ò²¡¤¹¤È¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ë°Ü¹Ô¤·¤Þ¤¹¡£¤½¤ÎºÝ¡¢´Ö°ã¤Ã¤¿¤êÆþÎÏÅÓ + Ãæ¤Î¥³¥Þ¥ó¥É¤ò¼è¤ê¾Ã¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ ¤µ¤Æ¡¢Â³¤±¤Æ¥ì¥Ã¥¹¥ó 2 ¤ò»Ï¤á¤Þ¤·¤ç¤¦¡£ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ¥ì¥Ã¥¹¥ó 2.1: ºï½ü¥³¥Þ¥ó¥É @@ -143,7 +190,7 @@ NOTE: 1. ¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ç¤¢¤ë¤³¤È¤ò³Îǧ¤¹¤ë¤¿¤á¤Ë ¤ò²¡¤·¤Þ¤·¤ç¤¦¡£ - 2. °Ê²¼¤Î ---> ¤Èµ­¤µ¤ì¤¿¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ + 2. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ 3. ¾Ã¤·¤¿¤¤Ã±¸ì¤ÎÀèƬ¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ @@ -154,7 +201,7 @@ NOTE: ---> ¤³¤Î ʸ »æ ¤Ë¤Ï ¤¤¤¯¤Ä¤«¤Î ¤¿¤Î¤·¤¤ ɬÍפΤʤ¤ ñ¸ì ¤¬ ´Þ¤Þ¤ì¤Æ ¤¤¤Þ¤¹¡£ - 5. 3 ¤«¤é 4 ¤Þ¤Ç¤òʸ¤¬Àµ¤·¤¯¤Ê¤ë¤Þ¤Ç·«¤êÊÖ¤·¡¢¥ì¥Ã¥¹¥ó 2.2 ¤Ë°Ü¤ê¤Þ¤·¤ç¤¦¡£ + 5. 3 ¤«¤é 4 ¤Þ¤Ç¤òʸ¤¬Àµ¤·¤¯¤Ê¤ë¤Þ¤Ç·«¤êÊÖ¤·¡¢¥ì¥Ã¥¹¥ó 2.2 ¤Ø¿Ê¤ß¤Þ¤·¤ç¤¦¡£ @@ -166,7 +213,7 @@ NOTE: 1. ¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ç¤¢¤ë¤³¤È¤ò³Îǧ¤¹¤ë¤Î¤Ë ¤ò²¡¤·¤Þ¤·¤ç¤¦¡£ - 2. °Ê²¼¤Î ---> ¤Èµ­¤µ¤ì¤¿¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ + 2. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ 3. Àµ¤·¤¤Ê¸¤ÎËöÈø¤Ø¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦(ºÇ½é¤Î . ¤Î¸å¤Ç¤¹)¡£ @@ -175,77 +222,123 @@ NOTE: ---> 狼¤¬¤³¤Î¹Ô¤ÎºÇ¸å¤ò2ÅÙ¥¿¥¤¥×¤·¤Þ¤·¤¿¡£ 2ÅÙ¥¿¥¤¥×¤·¤Þ¤·¤¿¡£ - 5. ¤É¤¦¤¤¤¦¤³¤È¤«Íý²ò¤¹¤ë¤¿¤á¤Ë¡¢¥ì¥Ã¥¹¥ó 2.3 ¤Ø°Ü¤ê¤Þ¤·¤ç¤¦¡£ + 5. ¤É¤¦¤¤¤¦¤³¤È¤«Íý²ò¤¹¤ë¤¿¤á¤Ë¡¢¥ì¥Ã¥¹¥ó 2.3 ¤Ø¿Ê¤ß¤Þ¤·¤ç¤¦¡£ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Lesson 2.3: ¥³¥Þ¥ó¥É¤ÈÌÜŪ¸ì + ¥ì¥Ã¥¹¥ó 2.3: ¥ª¥Ú¥ì¡¼¥¿¤È¥â¡¼¥·¥ç¥ó + + ¿¤¯¤Î¥³¥Þ¥ó¥É¤Ï¥ª¥Ú¥ì¡¼¥¿¤È¥â¡¼¥·¥ç¥ó¤«¤é¥Æ¥­¥¹¥È¤ËÊѹ¹¤ò²Ã¤Þ¤¹¡£ + ºï½ü¥³¥Þ¥ó¥É d ¤Î¥ª¥Ú¥ì¡¼¥¿¤Ï¼¡¤ÎÍͤˤʤäƤ¤¤Þ¤¹: - ºï½ü¥³¥Þ¥ó¥É d ¤Î·Á¼°¤Ï¼¡¤ÎÍͤˤʤäƤ¤¤Þ¤¹: + d ¥â¡¼¥·¥ç¥ó - [²ó¿ô] d ÌÜŪ¸ì ¤â¤·¤¯¤Ï d [²ó¿ô] ÌÜŪ¸ì ¤½¤ì¤¾¤ì: - ²ó¿ô - ¤½¤Î¥³¥Þ¥ó¥É¤ò²¿²ó·«¤êÊÖ¤¹¤«(¾Êά²Äǽ, ¾Êά¤·¤¿»þ¤Ï =1)¡£ - d - ºï½ü¥³¥Þ¥ó¥É¡£ - ÌÜŪ¸ì - ²¿¤ËÂФ·¤ÆƯ¤­¤«¤±¤ë¤«(°Ê²¼¤Ëµó¤²¤Þ¤¹)¡£ + d - ºï½ü¥³¥Þ¥ó¥É¡£ + ¥â¡¼¥·¥ç¥ó - ²¿¤ËÂФ·¤ÆƯ¤­¤«¤±¤ë¤«(°Ê²¼¤Ëµó¤²¤Þ¤¹)¡£ - ÌÜŪ¸ì°ìÍ÷: + ¥ª¥Ú¥ì¡¼¥¿¤Î°ìÉô°ìÍ÷: w - ¥«¡¼¥½¥ë°ÌÃÖ¤«¤é¶õÇò¤ò´Þ¤àñ¸ì¤ÎËöÈø¤Þ¤Ç¡£ e - ¥«¡¼¥½¥ë°ÌÃÖ¤«¤é¶õÇò¤ò´Þ¤Þ¤Ê¤¤Ã±¸ì¤ÎËöÈø¤Þ¤Ç¡£ $ - ¥«¡¼¥½¥ë°ÌÃÖ¤«¤é¹ÔËö¤Þ¤Ç¡£ -NOTE: ËÁ¸±¤·¤¿¤¤¿Í¤Ï¡¢¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ë¤Æ¥³¥Þ¥ó¥É¤Ê¤·¤ËÌÜŪ¸ì¤ò²¡¤·¤Æ + ¤Ä¤Þ¤ê de ¤È¥¿¥¤¥×¤¹¤ë¤È¡¢¥«¡¼¥½¥ë°ÌÃÖ¤«¤éñ¸ì¤Î½ª¤ï¤ê¤Þ¤Ç¤òºï½ü¤·¤Þ¤¹¡£ + +NOTE: ËÁ¸±¤·¤¿¤¤¿Í¤Ï¡¢¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ë¤Æ¥³¥Þ¥ó¥É¤Ê¤·¤Ë¥â¡¼¥·¥ç¥ó¤ò²¡¤·¤Æ ¤ß¤Þ¤·¤ç¤¦¡£¥«¡¼¥½¥ë¤¬ÌÜŪ¸ì°ìÍ÷¤Ç¼¨¤µ¤ì¤ë°ÌÃ֤˰ÜÆ°¤¹¤ë¤Ï¤º¤Ç¤¹¡£ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ¥ì¥Ã¥¹¥ó 2.4: ¥â¡¼¥·¥ç¥ó¤Ë¥«¥¦¥ó¥È¤ò»ÈÍѤ¹¤ë + + + ** ²¿²ó¤â¹Ô¤¤¤¿¤¤·«¤êÊÖ¤·¤Î¥â¡¼¥·¥ç¥ó¤ÎÁ°¤Ë¿ôÃͤò¥¿¥¤¥×¤·¤Þ¤¹¡£ ** + + 1. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿¶È¤ÎÀèƬ¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤¹¡£ + + 2. 2dw ¤ò¥¿¥¤¥×¤·¤Æñ¸ì2¤Äʬ°ÜÆ°¤·¤Þ¤¹¡£ + + 3. 3e ¤ò¥¿¥¤¥×¤·¤Æ3¤ÄÌܤÎñ¸ì¤Î½ªÃ¼¤Ë°ÜÆ°¤·¤Þ¤¹¡£ + + 4. 0 (¥¼¥í)¤ò¥¿¥¤¥×¤·¤Æ¹ÔƬ¤Ë°ÜÆ°¤·¤Þ¤¹¡£ + + 5. ¥¹¥Æ¥Ã¥× 2 ¤È 3 ¤ò°ã¤¦¿ôÃͤȻȤäƷ«¤êÊÖ¤·¤Þ¤¹¡£ + +---> This is just a line with words you can move around in. + + 6. ¥ì¥Ã¥¹¥ó 2.5 ¤Ë¿Ê¤ß¤Þ¤·¤ç¤¦¡£ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ¥ì¥Ã¥¹¥ó 2.4: ¤½¤ì°Ê³°¤Î·Á¤Î¥³¥Þ¥ó¥É + ¥ì¥Ã¥¹¥ó 2.5: ¤è¤ê¿¤¯¤òºï½ü¤¹¤ë¤¿¤á¤Ë¥«¥¦¥ó¥È¤ò»ÈÍѤ¹¤ë + + + ** ¥ª¥Ú¥ì¡¼¥¿¤È¥«¥¦¥ó¥È¤ò¥¿¥¤¥×¤¹¤ë¤È¡¢¤½¤ÎÁàºî¤¬Ê£¿ô²ó·«¤êÊÖ¤µ¤ì¤Þ¤¹¡£ ** + + ´û½Ò¤Îºï½ü¤Î¥ª¥Ú¥ì¡¼¥¿¤È¥â¡¼¥·¥ç¥ó¤ÎÁȤ߹ç¤ï¤»¤Ë¥«¥¦¥ó¥È¤òÄɲ乤뤳¤È¤Ç¡¢ + ¤è¤ê¿¤¯¤Îºï½ü¤¬¹Ô¤¨¤Þ¤¹: + d ¿ôÃÍ ¥â¡¼¥·¥ç¥ó + + 1. ---> ¤È¼¨¤µ¤ì¤¿¹Ô¤Î¹ÔƬÉôʬ¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ + + 2. UPPER CASE ¤Îñ¸ì2¤Ä¤ò 2dw ¤È¥¿¥¤¥×¤·¤Æºï½ü¤·¤Þ¤¹¡£ + + 3. UPPER CASE ¤È¤¤¤¦Ï¢Â³¤·¤¿Ã±¸ì¤ò¡¢1¤Ä¤Î¥³¥Þ¥ó¥É¤È°Û¤Ê¤ë¥«¥¦¥ó¥È¤ò»ØÄꤷ¡¢ + ¥¹¥Æ¥Ã¥× 1 ¤È 2 ¤ò·«¤êÊÖ¤·¤Þ¤¹¡£ + +---> ¤³¤ÎABC DE¹Ô¤ÎFGHI JK LMN OPñ¸ì¤ÏQ RS TUVåºÎï¤Ë¤Ê¤Ã¤¿¡£ + +NOTE: ¥ª¥Ú¥ì¡¼¥¿ d ¤È¥â¡¼¥·¥ç¥ó¤Î´Ö¤Ë¥«¥¦¥ó¥È¤ò»È¤Ã¤¿¾ì¹ç¡¢¥ª¥Ú¥ì¡¼¥¿¤Î¤Ê¤¤ + ¾ì¹ç¤Î¥â¡¼¥·¥ç¥ó¤Î¤è¤¦¤ËÆ°ºî¤·¤Þ¤¹¡£ + Îã: 3dw ¤È d3w ¤ÏƱÅù¤Ç¡¢3w ¤òºï½ü¤·¤Þ¤¹¡£ + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ¥ì¥Ã¥¹¥ó 2.6: ¹Ô¤ÎÁàºî + + ** ¹ÔÁ´ÂΤòºï½ü¤¹¤ë¤Ë¤Ï dd ¤È¥¿¥¤¥×¤·¤Þ¤¹ ** - ** ¹ÔÁ´ÂΤòºï½ü¤¹¤ë¤Ë¤Ï dd ¤È¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦ ** + ¹ÔÁ´ÂΤòºï½ü¤¹¤ëÉÑÅÙ¤¬Â¿¤¤¤Î¤Ç¡¢Vi¤Î¥Ç¥¶¥¤¥Ê¡¼¤Ï¹Ô¤Îºï½ü¤ò d ¤Î2²ó¥¿¥¤¥×¤È + ¤¤¤¦´Êñ¤Ê¤â¤Î¤Ë·è¤á¤Þ¤·¤¿¡£ - ¹ÔÁ´ÂΤκï½ü¤ÏÉÑÈˤ˹Ԥʤ¦ºî¶È¤Ê¤Î¤Ç¡¢Vim ¤ÎÀ߷׼ԤϹԤòºï½ü¤¹¤ë¤Î¤Ë¤Ï¡¢ - ñ¤ËÎóÆâ¤Ë¤Æ2²ó d ¤ò¥¿¥¤¥×¤¹¤ëÊý¤¬´Êñ¤À¤í¤¦¤ÈȽÃǤ·¤Þ¤·¤¿¡£ + 1. °Ê²¼¤Î¶ç¤Î2¹ÔÌܤ˥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤¹¡£ + 2. dd ¤È¥¿¥¤¥×¤·¤Æ¹Ô¤òºï½ü¤·¤Þ¤¹¡£ + 3. ¤µ¤é¤Ë4¹ÔÌܤ˰ÜÆ°¤·¤Þ¤¹¡£ + 4. 2dd ¤È¥¿¥¤¥×¤·¤Æ2¹Ô¤òºï½ü¤·¤Þ¤¹¡£ - 1. ²¼¤Ë¤¢¤ë°ìÏ¢¤Î¥Õ¥ì¡¼¥º¤Î2¹ÔÌܤ˥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ - 2. dd ¤È¥¿¥¤¥×¤·¤Æ¹Ô¤òºï½ü¤·¤Þ¤·¤ç¤¦¡£ - 3. ¤Ç¤Ï4¹ÔÌܤ˰ÜÆ°¤·¤Æ¤ß¤Þ¤·¤ç¤¦¡£ - 4. 2dd ¤È¥¿¥¤¥×¤·¤Æ2¹Ôºï½ü¤·¤Æ¤ß¤Þ¤·¤ç¤¦¡£ - (²ó¿ô-¥³¥Þ¥ó¥É-ÌÜŪ¸ì ¤Î·Á¼°¤ò»×¤¤½Ð¤·¤Þ¤·¤ç¤¦) +---> 1) ¥Ð¥é¤ÏÀÖ¤¤¡¢ +---> 2) ¤Ä¤Þ¤é¤Ê¤¤¤â¤Î¤Ï³Ú¤·¤¤¡¢ +---> 3) ¥¹¥ß¥ì¤ÏÀĤ¤¡¢ +---> 4) »ä¤Ï¼Ö¤ò¤â¤Ã¤Æ¤¤¤ë¡¢ +---> 5) »þ·×¤¬»þ¹ï¤ò¹ð¤²¤ë¡¢ +---> 6) º½Åü¤Ï´Å¤¤ +---> 7) ¥ª¥Þ¥¨¥â¥Ê¡¼ - 1) ¥Ð¥é¤ÏÀÖ¤¤¡¢ - 2) ¤Ä¤Þ¤é¤Ê¤¤¤â¤Î¤Ï³Ú¤·¤¤¡¢ - 3) ¥¹¥ß¥ì¤ÏÀĤ¤¡¢ - 4) »ä¤Ï¼Ö¤ò¤â¤Ã¤Æ¤¤¤ë¡¢ - 5) »þ·×¤¬»þ¹ï¤ò¹ð¤²¤ë¡¢ - 6) º½Åü¤Ï´Å¤¤ - 7) ¥ª¥Þ¥¨¥â¥Ê¡¼ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ¥ì¥Ã¥¹¥ó 2.5: ¤ä¤êľ¤·¥³¥Þ¥ó¥É + ¥ì¥Ã¥¹¥ó 2.7: ¤ä¤êľ¤·¥³¥Þ¥ó¥É ** ºÇ¸å¤Î¥³¥Þ¥ó¥É¤ò¼è¤ê¾Ã¤¹¤Ë¤Ï u ¤ò²¡¤·¤Þ¤¹¡£U ¤Ï¹ÔÁ´ÂΤμè¾Ã¤Ç¤¹¡£ ** - 1. °Ê²¼¤Î ---> ¤Èµ­¤µ¤ì¤¿¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¡¢ºÇ½é¤Î´Ö°ã¤¤¤Ë¥«¡¼¥½¥ë - ¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ + 1. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¡¢ºÇ½é¤Î´Ö°ã¤¤¤Ë¥«¡¼¥½ + ¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ 2. x ¤ò¥¿¥¤¥×¤·¤Æ¤¤¤é¤Ê¤¤ÀèƬ¤Îʸ»ú¤òºï½ü¤·¤Þ¤·¤ç¤¦¡£ 3. ¤µ¤¡¡¢u ¤ò¥¿¥¤¥×¤·¤ÆºÇ¸å¤Ë¼Â¹Ô¤·¤¿¥³¥Þ¥ó¥É¤ò¼è¤ê¾Ã¤·¤Þ¤·¤ç¤¦¡£ 4. º£Å٤ϡ¢x ¤ò»ÈÍѤ·¤Æ¸í¤ê¤òÁ´¤Æ½¤Àµ¤·¤Þ¤·¤ç¤¦¡£ 5. Âçʸ»ú¤Î U ¤ò¥¿¥¤¥×¤·¤Æ¡¢¹Ô¤ò¸µ¤Î¾õÂÖ¤ËÌᤷ¤Þ¤·¤ç¤¦¡£ 6. u ¤ò¥¿¥¤¥×¤·¤ÆľÁ°¤Î U ¥³¥Þ¥ó¥É¤ò¼è¾Ã¤·¤Þ¤·¤ç¤¦¡£ - 7. ¤Ç¤Ï¥³¥Þ¥ó¥É¤òºÆ¼Â¹Ô¤¹¤ë¤Î¤Ë CTRL-R (CTRL ¤ò²¡¤·¤¿¤Þ¤Þ R ¤òÂǤÄ)¤ò - ¿ô²ó¥¿¥¤¥×¤·¤Æ¤ß¤Þ¤·¤ç¤¦(¼è¾Ã¤Î¼è¾Ã)¡£ + 7. ¤Ç¤Ï¥³¥Þ¥ó¥É¤òºÆ¼Â¹Ô¤¹¤ë¤Î¤Ë CTRL-R (CTRL ¤ò²¡¤·¤¿¤Þ¤Þ R ¤òÂǤÄ)¤ò¿ô²ó + ¥¿¥¤¥×¤·¤Æ¤ß¤Þ¤·¤ç¤¦(¼è¾Ã¤Î¼è¾Ã)¡£ ---> ¤³¤Î¤Î¹Ô¤Î¤Î´Ö°ã¤¤¤ò½¤Àµ¡¹¤·¡¢¸å¤Ç¤½¤ì¤é¤Î½¤Àµ¤ò¤ò¼è¾Ã¤·¤Þ¤Þ¤¹¤¹¡£ - 8. ¤³¤ì¤Ï¤È¤Æ¤âÊØÍø¤Ê¥³¥Þ¥ó¥É¤Ç¤¹¡£¤µ¤¡¥ì¥Ã¥¹¥ó 2 Í×Ìó¤Ë°Ü¤ê¤Þ¤·¤ç¤¦¡£ + 8. ¤³¤ì¤Ï¤È¤Æ¤âÊØÍø¤Ê¥³¥Þ¥ó¥É¤Ç¤¹¡£¤µ¤¡¥ì¥Ã¥¹¥ó 2 Í×Ìó¤Ø¿Ê¤ß¤Þ¤·¤ç¤¦¡£ @@ -255,24 +348,24 @@ NOTE: 1. ¥«¡¼¥½¥ë°ÌÃÖ¤«¤éñ¸ì¤ÎËöÈø¤Þ¤Ç¤òºï½ü¤¹¤ë¤Ë¤Ï dw ¤È¥¿¥¤¥×¤·¤Þ¤¹¡£ - 2. ¥«¡¼¥½¥ë°ÌÃÖ¤«¤é¹Ô¤ÎËöÈø¤Þ¤Ç¤òºï½ü¤¹¤ë¤Ë¤Ï d$ ¤È¥¿¥¤¥×¤·¤Þ¤¹¡£ - 3. ¹ÔÁ´ÂΤòºï½ü¤¹¤ë¤Ë¤Ï dd ¤È¥¿¥¤¥×¤·¤Þ¤¹¡£ - 4. ¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ç¤Î¥³¥Þ¥ó¥É·Á¼°¤Ï + 4. ¥â¡¼¥·¥ç¥ó¤ò·«¤êÊÖ¤¹¤Ë¤Ï¿ôÃͤòÉÕÍ¿¤·¤Þ¤¹: 2w + 5. Êѹ¹¤ËÍѤ¤¤ë¥³¥Þ¥ó¥É¤Î·Á¼°¤Ï + ¥ª¥Ú¥ì¡¼¥¿ [¿ôÃÍ] ¥â¡¼¥·¥ç¥ó - [²ó¿ô] ¥³¥Þ¥ó¥É ÌÜŪ¸ì ¤â¤·¤¯¤Ï ¥³¥Þ¥ó¥É [²ó¿ô] ÌÜŪ¸ì ¤½¤ì¤¾¤ì: - ²ó¿ô - ¤½¤Î¥³¥Þ¥ó¥É¤ò²¿²ó·«¤êÊÖ¤¹¤«¡£ - ¥³¥Þ¥ó¥É - ºï½ü d ¤ÎÎà¤Ç²¿¤ò¤¹¤ë¤«¡£ - ÌÜŪ¸ì - ñ¸ì w ¤ä¹ÔËö $ ¤Ê¤É¤ÎÎà¤Ç²¿¤ËÂФ·¤ÆƯ¤­¤«¤±¤ë¤«¡£ + ¥ª¥Ú¥ì¡¼¥¿ - ºï½ü d ¤ÎÎà¤Ç²¿¤ò¤¹¤ë¤«¡£ + ¿ôÃÍ - ¤½¤Î¥³¥Þ¥ó¥É¤ò²¿²ó·«¤êÊÖ¤¹¤«¡£ + ¥â¡¼¥·¥ç¥ó - w (ñ¸ì)¤ä $ (¹ÔËö)¤Ê¤É¤ÎÎà¤Ç¡¢¥Æ¥­¥¹¥È¤Î²¿¤ËÂФ·¤ÆƯ¤­¤« + ¤±¤ë¤«¡£ - 5. Á°²ó¤ÎÆ°ºî¤ò¼è¾Ã¤¹: u (¾®Ê¸»ú u) + 6. ¹Ô¤ÎÀèƬ¤Ë°ÜÆ°¤¹¤ë¤Ë¤Ï¥¼¥í¤ò»ÈÍѤ·¤Þ¤¹: 0 + + 7. Á°²ó¤ÎÆ°ºî¤ò¼è¾Ã¤¹: u (¾®Ê¸»ú u) ¹ÔÁ´ÂΤÎÊѹ¹¤ò¼è¾Ã¤¹: U (Âçʸ»ú U) ¼è¾Ã¤·¤Î¼è¾Ã¤·: CTRL-R - - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ¥ì¥Ã¥¹¥ó 3.1: Ž¤êÉÕ¤±¥³¥Þ¥ó¥É @@ -302,7 +395,7 @@ NOTE: ** ¥«¡¼¥½¥ë¤Î²¼¤Îʸ»ú¤òÃÖ¤­´¹¤¨¤ë¤Ë¤Ï r ¤ò¥¿¥¤¥×¤·¤Þ¤¹ ** - 1. °Ê²¼¤Î ---> ¤Èµ­¤µ¤ì¤¿¤µ¤ì¤¿ºÇ½é¤Î¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ + 1. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿ºÇ½é¤Î¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ 2. ºÇ½é¤Î´Ö°ã¤¤¤ÎÀèƬ¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ @@ -313,7 +406,7 @@ NOTE: ---> ¤³¤Î¹ç¤ò¿ÍÎϤ·¤¿»þ¤Í¡¢¤½¤Î¿Í¤Ï´ö¤Ä¤«Ìä°ã¤Ã¤¿¥­¡¼¤ò²¡¤·¤â¤·¤¿! ---> ¤³¤Î¹Ô¤òÆþÎϤ·¤¿»þ¤Ë¡¢¤½¤Î¿Í¤Ï´ö¤Ä¤«´Ö°ã¤Ã¤¿¥­¡¼¤ò²¡¤·¤Þ¤·¤¿! - 5. ¤µ¤¡¡¢¥ì¥Ã¥¹¥ó 3.2 ¤Ë°Ü¤ê¤Þ¤·¤ç¤¦¡£ + 5. ¤µ¤¡¡¢¥ì¥Ã¥¹¥ó 3.2 ¤Ø¿Ê¤ß¤Þ¤·¤ç¤¦¡£ NOTE: ¼ÂºÝ¤Ë»î¤·¤Þ¤·¤ç¤¦¡£·è¤·¤Æ³Ð¤¨¤ë¤À¤±¤Ë¤Ï¤·¤Ê¤¤¤³¤È¡£ @@ -325,7 +418,7 @@ NOTE: ** ñ¸ì¤Î°ìÉô¡¢¤â¤·¤¯¤ÏÁ´ÂΤòÊѹ¹¤¹¤ë¤Ë¤Ï cw ¤È¥¿¥¤¥×¤·¤Þ¤¹ ** - 1. °Ê²¼¤Î ---> ¤Èµ­¤µ¤ì¤¿¤µ¤ì¤¿ºÇ½é¤Î¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ + 1. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿ºÇ½é¤Î¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ 2. lubw ¤Î u ¤Î°ÌÃ֤˥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ @@ -348,14 +441,13 @@ cw ** Êѹ¹¥³¥Þ¥ó¥É¤Ï¡¢ºï½ü¥³¥Þ¥ó¥É¤ÈƱ¤¸Íͤ˥ª¥Ö¥¸¥§¥¯¥È¤ò»ÈÍѤ·¤Þ¤¹ ** - 1. Êѹ¹¥³¥Þ¥ó¥É¤Ï¡¢ºï½ü¥³¥Þ¥ó¥É¤ÈƱ¤¸¤è¤¦¤ÊÆ°ºî¤ò¤·¤Þ¤¹¡£¤½¤Î·Á¼°¤Ï - [²ó¿ô] c ÌÜŪ¸ì ¤â¤·¤¯¤Ï c [²ó¿ô] ÌÜŪ¸ì + c [¿ôÃÍ] ¥â¡¼¥·¥ç¥ó 2. ¥ª¥Ö¥¸¥§¥¯¥È¤âƱ¤¸¤Ç¡¢w ¤Ïñ¸ì¡¢ $ ¤Ï¹ÔËö¤Ê¤É¤È¤¤¤Ã¤¿¤â¤Î¤Ç¤¹¡£ - 3. °Ê²¼¤Î ---> ¤Èµ­¤µ¤ì¤¿¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ + 3. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ 4. ºÇ½é¤Î´Ö°ã¤¤¤Ø¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ @@ -364,6 +456,7 @@ cw ---> The end of this line needs some help to make it like the second. ---> The end of this line needs to be corrected using the c$ command. +NOTE: ¥¿¥¤¥×Ãæ¤Î´Ö°ã¤¤¤Ï¥Ð¥Ã¥¯¥¹¥Ú¡¼¥¹¥­¡¼¤ò»È¤Ã¤Æľ¤¹¤³¤È¤â¤Ç¤­¤Þ¤¹¡£ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ¥ì¥Ã¥¹¥ó 3 Í×Ìó @@ -376,40 +469,40 @@ cw 2. ¥«¡¼¥½¥ë¤Î²¼¤Îʸ»ú¤òÃÖ¤­´¹¤¨¤ë¤Ë¤Ï¡¢r ¤ò¥¿¥¤¥×¤·¤¿¸å¡¢¤½¤ì¤òÃÖ¤­´¹¤¨¤ë ʸ»ú¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£ - 3. Êѹ¹¥³¥Þ¥ó¥É¤Ç¤Ï¥«¡¼¥½¥ë°ÌÃÖ¤«¤éÆÃÄê¤ÎÌÜŪ¸ì¤Ç»ØÄꤵ¤ì¤ë½ªÃ¼¤Þ¤Ç¤òÊѹ¹ - ¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£Î㤨¤Ð cw ¤Ê¤é¤Ð¥«¡¼¥½¥ë°ÌÃÖ¤«¤éñ¸ì¤Î½ª¤ï¤ê¤Þ¤Ç¡¢ + 3. Êѹ¹¥³¥Þ¥ó¥É¤Ç¤Ï¥«¡¼¥½¥ë°ÌÃÖ¤«¤éÆÃÄê¤Î¥â¡¼¥·¥ç¥ó¤Ç»ØÄꤵ¤ì¤ë½ªÃ¼¤Þ¤Ç¤òÊÑ + ¹¹¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£Î㤨¤Ð cw ¤Ê¤é¤Ð¥«¡¼¥½¥ë°ÌÃÖ¤«¤éñ¸ì¤Î½ª¤ï¤ê¤Þ¤Ç¡¢ c$ ¤Ê¤é¤Ð¹Ô¤Î½ª¤ï¤ê¤Þ¤Ç¤òÊѹ¹¤·¤Þ¤¹¡£ 4. Êѹ¹¥³¥Þ¥ó¥É¤Î·Á¼°¤Ï - [²ó¿ô] c ÌÜŪ¸ì ¤â¤·¤¯¤Ï c [²ó¿ô] ÌÜŪ¸ì + c [¿ôÃÍ] ¥â¡¼¥·¥ç¥ó -¤µ¤¡¡¢¼¡¤Î¥ì¥Ã¥¹¥ó¤Ë°Ü¤ê¤Þ¤·¤ç¤¦¡£ +¤µ¤¡¡¢¼¡¤Î¥ì¥Ã¥¹¥ó¤Ø¿Ê¤ß¤Þ¤·¤ç¤¦¡£ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ¥ì¥Ã¥¹¥ó 4.1: °ÌÃ֤ȥե¡¥¤¥ë¤Î¾ðÊó - - ** ¥Õ¥¡¥¤¥ëÆâ¤Ç¤Î°ÌÃ֤ȥե¡¥¤¥ë¤Î¾õÂÖ¤òɽ¼¨¤¹¤ë¤Ë¤Ï CTRL-g ¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£ - ¥Õ¥¡¥¤¥ëÆâ¤Î¤¢¤ë¹Ô¤Ë°ÜÆ°¤¹¤ë¤Ë¤Ï SHIFT-G ¤ò¥¿¥¤¥×¤·¤Þ¤¹ ** + ** ¥Õ¥¡¥¤¥ëÆâ¤Ç¤Î°ÌÃ֤ȥե¡¥¤¥ë¤Î¾õÂÖ¤òɽ¼¨¤¹¤ë¤Ë¤Ï CTRL-G ¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£ + ¥Õ¥¡¥¤¥ëÆâ¤Î¤¢¤ë¹Ô¤Ë°ÜÆ°¤¹¤ë¤Ë¤Ï G ¤ò¥¿¥¤¥×¤·¤Þ¤¹ ** NOTE: ¥¹¥Æ¥Ã¥×¤ò¼Â¹Ô¤¹¤ëÁ°¤Ë¡¢¤³¤Î¥ì¥Ã¥¹¥óÁ´¤Æ¤ËÌܤòÄ̤·¤Þ¤·¤ç¤¦!! - 1. CTRL ¤ò²¡¤·¤¿¤Þ¤Þ g ¤ò²¡¤·¤Þ¤·¤ç¤¦¡£¥Ú¡¼¥¸¤Î°ìÈÖ²¼¤Ë¤¢¤ë¥¹¥Æ¡¼¥¿¥¹¹Ô - ¤Ë¥Õ¥¡¥¤¥ë̾¤È¹Ô¤¬É½¼¨¤µ¤ì¤ë¤Ï¤º¤Ç¤¹¡£ ¥¹¥Æ¥Ã¥× 3 ¤Î¤¿¤á¤Ë¹ÔÈÖ¹æ¤ò - ³Ð¤¨¤Æ¤ª¤­¤Þ¤·¤ç¤¦¡£(Ìõ¼ÔÃí:¥ë¡¼¥é¡¼¤¬¤¢¤ë¾ì¹ç¤Ï¤½¤Á¤é¤ËÃíÌÜ) - - 2. ºÇ²¼¹Ô¤Ë°ÜÆ°¤¹¤ë¤¿¤á¤Ë shift-G ¤È¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£ + 1. CTRL ¤ò²¡¤·¤¿¤Þ¤Þ g ¤ò²¡¤·¤Þ¤·¤ç¤¦¡£¤³¤ÎÁàºî¤ò CTRL-G ¤È¸Æ¤ó¤Ç¤¤¤Þ¤¹¡£ + ¥Ú¡¼¥¸¤Î°ìÈÖ²¼¤Ë¥Õ¥¡¥¤¥ë̾¤È¹ÔÈֹ椬ɽ¼¨¤µ¤ì¤ë¤Ï¤º¤Ç¤¹¡£ ¥¹¥Æ¥Ã¥× 3¤Î¤¿¤á + ¤Ë¹ÔÈÖ¹æ¤ò³Ð¤¨¤Æ¤ª¤­¤Þ¤·¤ç¤¦¡£ - 3. Àè¤Û¤É¤Î¹Ô¤ÎÈÖ¹æ¤ò¥¿¥¤¥×¤·¡¢ shift-G ¤ò¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£ - ºÇ½é¤Ë Ctrl-g ¤ò²¡¤·¤¿¹Ô¤ËÌá¤Ã¤ÆÍè¤ë¤Ï¤º¤Ç¤¹¡£ - (¿ô»ú¤ò¥¿¥¤¥×¤·¤Æ¤¤¤ë¤È¤­¤Ë¤Ï²èÌ̤Ëɽ¼¨¤µ¤ì¤Þ¤»¤ó) +NOTE: ²èÌ̤ᦲ¼¶ù¤Ë¥«¡¼¥½¥ë¤Î°ÌÃÖ¤¬É½¼¨¤µ¤ì¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¤³¤ì¤Ï + 'ruler' ¥ª¥×¥·¥ç¥ó(¥ì¥Ã¥¹¥ó6¤ÇÀâÌÀ)¤òÀßÄꤹ¤ë¤³¤È¤Çɽ¼¨¤µ¤ì¤Þ¤¹¡£ - 4. ¼«¿®¤¬»ý¤Æ¤¿¤é¥¹¥Æ¥Ã¥× 1 ¤«¤é 3 ¤ò¼Â¹Ô¤·¤Þ¤·¤ç¤¦¡£ + 2. ºÇ²¼¹Ô¤Ë°ÜÆ°¤¹¤ë¤¿¤á¤Ë G ¤ò¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£ + ¥Õ¥¡¥¤¥ë¤ÎÀèƬ¤Ë°ÜÆ°¤¹¤ë¤Ë¤Ï gg ¤È¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£ + 3. Àè¤Û¤É¤Î¹Ô¤ÎÈÖ¹æ¤ò¥¿¥¤¥×¤· G ¤ò¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£ºÇ½é¤Ë CTRL-G ¤ò²¡¤·¤¿¹Ô + ¤ËÌá¤Ã¤ÆÍè¤ë¤Ï¤º¤Ç¤¹¡£ + 4. ¼«¿®¤¬»ý¤Æ¤¿¤é¥¹¥Æ¥Ã¥× 1 ¤«¤é 3 ¤ò¼Â¹Ô¤·¤Þ¤·¤ç¤¦¡£ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ¥ì¥Ã¥¹¥ó 4.2: ¸¡º÷¥³¥Þ¥ó¥É @@ -417,22 +510,22 @@ cw ** ¸ì¶ç¤ò¸¡º÷¤¹¤ë¤Ë¤Ï / ¤È¡¢Á°Êý¸¡º÷¤¹¤ë¸ì¶ç¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£** - 1. ¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ç / ¤È¤¤¤¦Ê¸»ú¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£²èÌÌ°ìÈÖ²¼¤Ë : ¥³¥Þ¥ó¥É - ¤ÈƱ¤¸ÍÍ¤Ë / ¤¬¸½¤ì¤ë¤³¤È¤Ëµ¤¤Å¤¯¤Ç¤·¤ç¤¦¡£ + 1. ¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ç / ¤È¤¤¤¦Ê¸»ú¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£²èÌÌ°ìÈÖ²¼¤Ë : ¥³¥Þ¥ó¥É¤È + Ʊ¤¸ÍÍ¤Ë / ¤¬¸½¤ì¤ë¤³¤È¤Ëµ¤¤Å¤¯¤Ç¤·¤ç¤¦¡£ 2. ¤Ç¤Ï¡¢'errroor' ¤È¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£¤³¤ì¤¬¸¡º÷¤·¤¿¤¤Ã±¸ì¤Ç¤¹¡£ 3. Ʊ¤¸¸ì¤ò¤â¤¦°ìÅÙ¸¡º÷¤¹¤ë¤È¤­¤Ï ñ¤Ë n ¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£ µÕÊý¸þ¤Ë¸ì¶ç¤ò¸¡º÷¤¹¤ë¤È¤­¤Ï N ¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£ - 4. µÕÊý¸þ¤Ë¸ì¶ç¤ò¸¡º÷¤·¤¿¤¤¾ì¹ç¤Ï¡¢/ ¥³¥Þ¥ó¥É¤Î¤«¤ï¤ê¤Ë ? ¥³¥Þ¥ó¥É¤ò»ÈÍѤ· - ¤Þ¤¹¡£ - ----> "errroor" is not the way to spell error; errroor is an error. - -¸¡º÷¤¬¥Õ¥¡¥¤¥ë¤Î½ª¤ï¤ê¤Ë㤹¤ë¤È¡¢¥Õ¥¡¥¤¥ë¤ÎÀèƬ¤«¤é¸¡º÷¤ò³¹Ô¤·¤Þ¤¹¡£ + 4. µÕÊý¸þ¤Ë¸ì¶ç¤ò¸¡º÷¤¹¤ë¾ì¹ç¤Ï¡¢/ ¤ÎÂå¤ï¤ê¤Ë ? ¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Þ¤¹¡£ + 5. ¸µ¤Î¾ì½ê¤ËÌá¤ë¤Ë¤Ï CTRL-O (Ctrl ¤ò²¡¤·Â³¤±¤Ê¤¬¤é o ʸ»ú¥¿¥¤¥×)¤ò¥¿¥¤¥×¤· + ¤Þ¤¹¡£¤µ¤é¤ËÌá¤ë¤Ë¤Ï¤³¤ì¤ò·«¤êÊÖ¤·¤Þ¤¹¡£CTRL-I ¤ÏÁ°Êý¸þ¤Ç¤¹¡£ +Note: "errroor" ¤Ï error ¤È¥¹¥Ú¥ë¤¬°ã¤¤¤Þ¤¹; errroor ¤Ï¤¤¤ï¤æ¤ë error ¤Ç¤¹¡£ +Note: ¸¡º÷¤¬¥Õ¥¡¥¤¥ë¤Î½ª¤ï¤ê¤Ë㤹¤ë¤È¡¢¥ª¥×¥·¥ç¥ó 'wrapscan' ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë + ¾ì¹ç¤Ï¡¢¥Õ¥¡¥¤¥ë¤ÎÀèƬ¤«¤é¸¡º÷¤ò³¹Ô¤·¤Þ¤¹¡£ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ¥ì¥Ã¥¹¥ó 4.3: Âбþ¤¹¤ë³ç¸Ì¤ò¸¡º÷ @@ -440,8 +533,7 @@ cw ** Âбþ¤¹¤ë ),] ¤ä } ¤ò¸¡º÷¤¹¤ë¤Ë¤Ï % ¤ò¥¿¥¤¥×¤·¤Þ¤¹ ** - 1. °Ê²¼¤Î ---> ¤Èµ­¤µ¤ì¤¿¤µ¤ì¤¿¹Ô¤Ç (,[ ¤« { ¤Î¤É¤ì¤«¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ° - ¤·¤Þ¤·¤ç¤¦¡£ + 1. ²¼¤Î ---> ¤Ç¼¨¤µ¤ì¤¿¹Ô¤Ç (,[ ¤« { ¤Î¤É¤ì¤«¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ 2. ¤½¤³¤Ç % ¤È¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£ @@ -449,21 +541,22 @@ cw 4. ºÇ½é¤Î³ç¸Ì¤Ë°ÜÆ°¤¹¤ë¤Ë¤Ï % ¤È¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£ + 5. ¾¤Î (,),[,],{ or } ¤Ç¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¡¢% ¤¬²¿¤ò¤·¤Æ¤¤¤ë¤«³Îǧ¤·¤Þ¤·¤ç¤¦¡£ + ---> This ( is a test line with ('s, ['s ] and {'s } in it. )) + NOTE: ¤³¤Îµ¡Ç½¤Ï³ç¸Ì¤¬°ìÃפ·¤Æ¤¤¤Ê¤¤¥×¥í¥°¥é¥à¤ò¥Ç¥Ð¥Ã¥°¤¹¤ë¤Î¤Ë¤È¤Æ¤âÌòΩ¤Á ¤Þ¤¹¡£ - - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ¥ì¥Ã¥¹¥ó 4.4: ´Ö°ã¤¤¤òÊѹ¹¤¹¤ëÊýË¡ ** 'old' ¤ò 'new' ¤ËÃÖ´¹¤¹¤ë¤Ë¤Ï :s/old/new/g ¤È¥¿¥¤¥×¤·¤Þ¤¹ ** - 1. °Ê²¼¤Î ---> ¤Èµ­¤µ¤ì¤¿¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ + 1. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ 2. :s/thee/the ¤È¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£¤³¤Î¥³¥Þ¥ó¥É¤Ï¤½¤Î¹Ô¤ÇºÇ½é¤Ë¸« ¤Ä¤«¤Ã¤¿¤â¤Î¤Ë¤À¤±¹Ô¤Ê¤ï¤ì¤ë¤³¤È¤Ëµ¤¤ò¤Ä¤±¤Þ¤·¤ç¤¦¡£ @@ -474,27 +567,28 @@ NOTE: ---> thee best time to see thee flowers is in thee spring. 4. Ê£¿ô¹Ô¤«¤é¸«¤Ä¤«¤ëʸ»ú¤òÊѹ¹¤¹¤ë¤Ë¤Ï - :#,#s/old/new/g #,# ¤Ï£²¹Ô¤Î¹ÔÈÖ¹æ¤ò»Ø¤·¤Þ¤¹¡£ + :#,#s/old/new/g #,# ¤Ë¤ÏÃÖ¤­´¹¤¨¤ëÈϰϤγ«»Ï¤È½ªÎ»¤Î¹ÔÈÖ¹æ¤ò»ØÄꤷ¤Þ + ¤¹¡£ :%s/old/new/g ¥Õ¥¡¥¤¥ëÁ´ÂΤǸ«¤Ä¤«¤ë¤â¤Î¤ËÂФ·¤ÆÊѹ¹¤¹¤ë¡£ - - - + :%s/old/new/gc ¥Õ¥¡¥¤¥ëÁ´ÂΤǸ«¤Ä¤«¤ë¤â¤Î¤ËÂФ·¤Æ¡¢1¤Ä1¤Ä³Îǧ¤ò¤È¤ê¤Ê + ¤¬¤éÊѹ¹¤¹¤ë¡£ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ¥ì¥Ã¥¹¥ó 4 Í×Ìó - 1. Ctrl-g ¤Ï¥Õ¥¡¥¤¥ë¤Ç¤Î°ÌÃ֤ȥե¡¥¤¥ë¤Î¾ÜºÙ¤òɽ¼¨¤·¤Þ¤¹¡£ - Shift-G ¤Ï¥Õ¥¡¥¤¥ë¤ÎºÇ²¼¹Ô¤Ë°ÜÆ°¤·¤Þ¤¹¡£¹ÔÈÖ¹æ¸å¤Ë Shift-G ¤È¤¹¤ë¤È - ¤½¤Î¹Ô¤Ë°ÜÆ°¤·¤Þ¤¹¡£ + 1. CTRL-G ¤Ï¥Õ¥¡¥¤¥ë¤Ç¤Î°ÌÃ֤ȥե¡¥¤¥ë¤Î¾ÜºÙ¤òɽ¼¨¤·¤Þ¤¹¡£ + G ¤Ï¥Õ¥¡¥¤¥ë¤ÎºÇ²¼¹Ô¤Ë°ÜÆ°¤·¤Þ¤¹¡£ + ¿ôÃÍ G ¤Ï¤½¤Î¹Ô¤Ë°ÜÆ°¤·¤Þ¤¹¡£ + gg ¤ÏÀèƬ¹Ô¤Ë°ÜÆ°¤·¤Þ¤¹¡£ 2. / ¤Î¸å¤Ë¸ì¶ç¤ò¥¿¥¤¥×¤¹¤ë¤ÈÁ°Êý¤Ë¸ì¶ç¤ò¸¡º÷¤·¤Þ¤¹¡£ ? ¤Î¸å¤Ë¸ì¶ç¤ò¥¿¥¤¥×¤¹¤ë¤È¸åÊý¤Ë¸ì¶ç¤ò¸¡º÷¤·¤Þ¤¹¡£ - ¸¡º÷¤Î¸å n ¤Ç¡¢Æ±Êý¸þ¤Ë¸¡º÷¤òºÆ¤Ó¹Ô¤¤¡¢¤Þ¤¿ N ¤ÇµÕÊý¸þ¤Ë¸¡º÷¤ò¹Ô¤Ê¤¤¤Þ - ¤¹¡£ + ¸¡º÷¤Î¸å¤Î n ¤ÏƱ¤¸Êý¸þ¤Î¼¡¤Î¸¡º÷¤ò¡¢N ¤ÏµÕÊý¸þ¤Î¸¡º÷¤ò¤·¤Þ¤¹¡£ + CTRL-O ¤Ï¾ì½ê¤òÁ°¤Ë°Ü¤·¡¢CTRL-I ¤Ï¾ì½ê¤ò¼¡¤Ë°ÜÆ°¤·¤Þ¤¹¡£ - 3. (,),[,],{, or } ¾å¤Ë¥«¡¼¥½¥ë¤¬¤¢¤ë¾õÂÖ¤Ç % ¤ò¥¿¥¤¥×¤¹¤ë¤È - Âбþ¤·¤¿ÂФ˰ÜÆ°¤·¤Þ¤¹¡£ + 3. (,),[,],{, ¤â¤·¤¯¤Ï } ¾å¤Ë¥«¡¼¥½¥ë¤¬¤¢¤ë¾õÂÖ¤Ç % ¤ò¥¿¥¤¥×¤¹¤ë¤ÈÂФˤʤëʸ + »ú¤Ø°ÜÆ°¤·¤Þ¤¹¡£ 4. ¸½ºß¹Ô¤ÎºÇ½é¤Î old ¤ò new ¤ËÃÖ´¹¤¹¤ë¡£ :s/old/new ¸½ºß¹Ô¤ÎÁ´¤Æ¤Î old ¤ò new ¤ËÃÖ´¹¤¹¤ë¡£ :s/old/new/g @@ -502,7 +596,6 @@ NOTE: ¥Õ¥¡¥¤¥ë¤ÎÃæ¤ÎÁ´¤Æ¤Î¸¡º÷¸ì¶ç¤òÃÖ´¹¤¹¤ë¡£ :%s/old/new/g 'c' ¤ò²Ã¤¨¤ë¤ÈÃÖ´¹¤ÎÅ٤˳Îǧ¤òµá¤á¤ë¡£ :%s/old/new/gc - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ¥ì¥Ã¥¹¥ó 5.1: ³°Éô¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ëÊýË¡ @@ -519,11 +612,11 @@ NOTE: ¥·¥§¥ë¥×¥í¥ó¥×¥È¤Î¤è¤¦¤Ë¥Ç¥£¥ì¥¯¥È¥ê¤Î°ìÍ÷¤¬É½¼¨¤µ¤ì¤ë¤Ï¤º¤Ç¤¹¡£ ¤â¤·¤¯¤Ï ls ¤¬Æ°¤«¤Ê¤¤¤Ê¤é¤Ð :!dir ¤ò»ÈÍѤ·¤Þ¤·¤ç¤¦¡£ ----> NOTE: ¤³¤ÎÊýË¡¤Ë¤è¤Ã¤Æ¤¢¤é¤æ¤ë¥³¥Þ¥ó¥É¤¬¼Â¹Ô¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ - ----> NOTE: Á´¤Æ¤Î : ¥³¥Þ¥ó¥É¤Ï ¤ò²¡¤·¤Æ½ªÎ»¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£ - +Note: ¤³¤ÎÊýË¡¤Ë¤è¤Ã¤Æ¤¢¤é¤æ¤ë¥³¥Þ¥ó¥É¤¬¼Â¹Ô¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤â¤Á¤í¤ó°ú¿ô + ¤âÍ¿¤¨¤é¤ì¤Þ¤¹¡£ +Note: Á´¤Æ¤Î : ¥³¥Þ¥ó¥É¤Ï ¤ò²¡¤·¤Æ½ªÎ»¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£ + °Ê¹ß¤Ç¤Ï¤³¤Î¤³¤È¤Ë¸ÀµÚ¤·¤Þ¤»¤ó¡£ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -540,37 +633,38 @@ NOTE: 3. ¤Ç¤Ï :w TEST ¤È¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦ (TEST ¤Ï¡¢Áª¤ó¤À¥Õ¥¡¥¤¥ë̾¤Ç¤¹)¡£ 4. ¤³¤ì¤Ë¤è¤ê¥Õ¥¡¥¤¥ëÁ´ÂΤ¬ TEST ¤È¤¤¤¦Ì¾Á°¤ÇÊݸ¤µ¤ì¤Þ¤¹¡£ - ¤â¤¦°ìÅÙ :!dir ¤È¥¿¥¤¥×¤·¤Æ³Îǧ¤·¤Æ¤ß¤Þ¤·¤ç¤¦¡£ + ¤â¤¦°ìÅÙ :!dir ¤â¤·¤¯¤Ï !ls ¤È¥¿¥¤¥×¤·¤Æ³Îǧ¤·¤Æ¤ß¤Þ¤·¤ç¤¦¡£ ----> ¤³¤³¤Ç Vim ¤ò½ªÎ»¤·¡¢¥Õ¥¡¥¤¥ë̾ TEST ¤È¶¦¤Ëµ¯Æ°¤¹¤ë¤È¡¢Êݸ¤·¤¿»þ¤Î +Note: ¤³¤³¤Ç Vim ¤ò½ªÎ»¤·¡¢¥Õ¥¡¥¤¥ë̾ TEST ¤È¶¦¤Ëµ¯Æ°¤¹¤ë¤È¡¢Êݸ¤·¤¿»þ¤Î ¥Á¥å¡¼¥È¥ê¥¢¥ë¤ÎÊ£À½¤¬¤Ç¤­¾å¤¬¤ë¤Ï¤º¤Ç¤¹¡£ - 5. ¤Ç¤Ï¡¢ :!del TEST ¤È¥¿¥¤¥×¤·¤Æ¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Æ¤ß¤Þ¤·¤ç¤¦¡£ - + 5. ¤µ¤é¤Ë¡¢¼¡¤Î¤è¤¦¤Ë¥¿¥¤¥×¤·¤Æ¥Õ¥¡¥¤¥ë¤ò¾Ã¤·¤Þ¤·¤ç¤¦(MS-DOS): :!del TEST + ¤â¤·¤¯¤Ï(Unix): :!rm TEST ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ¥ì¥Ã¥¹¥ó 5.3: ÁªÂò¤·¤¿½ñ¤­¹þ¤ß - ** ÉôʬŪ¤ËÊݸ¤¹¤ë¤Ë¤Ï :#,# w ¥Õ¥¡¥¤¥ë̾ ¤È¥¿¥¤¥×¤·¤Þ¤¹ ** +** ¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤òÊݸ¤¹¤ë¤Ë¤Ï¡¢v ¥â¡¼¥·¥ç¥ó¤È :w FILENAME ¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£ ** - 1. ¤â¤¦°ìÅ٥ǥ£¥ì¥¯¥È¥ê¤Î°ìÍ÷¤ò¼èÆÀ¤¹¤ë¤¿¤á¤Ë :!ls ¤È¥¿¥¤¥×¤·¡¢TEST ¤ÎÍÍ¤Ë - ¥Õ¥¡¥¤¥ë¤ò°ì¤ÄÁª¤ó¤Ç¤ß¤Þ¤·¤ç¤¦¡£ + 1. ¤³¤Î¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤¹¡£ - 2. ¤³¤Î¥Ú¡¼¥¸¤Î»Ï¤á¤Þ¤Ç¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¡¢¥Õ¥¡¥¤¥ë¤Î¹Ô¿ô¤òÃΤ뤿¤á¤Ë Ctrl-g ¤È - ¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£¤½¤Î¹ÔÈÖ¹æ¤ò²±¤¨¤Æ¤ª¤­¤Þ¤·¤ç¤¦¡£ + 2. v ¤ò²¡¤·¡¢°Ê²¼¤ÎÂè5¹àÌܤ˥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤¹¡£¥Æ¥­¥¹¥È¤¬¶¯Ä´É½¼¨¤µ¤ì¤ë¤Î + ¤ËÃíÌܤ·¤Æ²¼¤µ¤¤¡£ - 3. ¤½¤·¤Æ¥Ú¡¼¥¸¤Î½ª¤ê¤Þ¤Ç°ÜÆ°¤·¡¢ºÆÅÙ Ctrl-g ¤ò¹Ô¤¤¤Þ¤¹¡£ - ¤³¤Î¹ÔÈÖ¹æ¤â²±¤¨¤Æ¤ª¤­¤Þ¤·¤ç¤¦¡£ + 3. ʸ»ú : ¤ò²¡¤¹¤È¡¢²èÌ̤κDz¼Éô¤Ë :'<,'> ¤¬¸½¤ì¤Þ¤¹¡£ - 4. ¤¢¤ëÉôʬ¤À¤±¤ò TEST ¤È¤¤¤¦Ì¾¤ÇÊݸ¤¹¤ë¤¿¤á¤Ë¡¢:#,# w TEST ¤È¥¿¥¤¥×¤·¤Þ¤¹¡£ - ¤³¤Î #,# ¤Ï³Ð¤¨¤Æ¤ª¤¤¤¿£²¤Ä¤ÎÈÖ¹æ(¾åü,²¼Ã¼) ¤Ç¤¢¤ê¡¢ TEST ¤¬¥Õ¥¡¥¤¥ë̾ - ¤È¤Ê¤ê¤Þ¤¹¡£ + 4. w TEST (TESET ¤Ï¸ºß¤·¤Ê¤¤¥Õ¥¡¥¤¥ë̾)¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£ + Enter ¤ò²¡¤¹Á°¤Ë :'<,'>w TEST ¤È¤Ê¤Ã¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ²¼¤µ¤¤¡£ - 5. ºÆÅÙ¡¢¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤¹¤ë¤³¤È¤ò³Îǧ¤¹¤ë¤¿¤á¤Ë :!dir ¤È¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£ - ¤¿¤À¤·¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¾Ã¤·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£ + 5. Vim ¤Ï TEST ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤ËÁªÂò¤µ¤ì¤¿¹Ô¤ò½ñ¤­¹þ¤à¤Ç¤·¤ç¤¦¡£ + !dir ¤â¤·¤¯¤Ï !ls ¤Ç¤½¤ì¤ò³Îǧ¤·¤Þ¤¹¡£ + ¤½¤ì¤Ïºï½ü¤·¤Ê¤¤¤Ç¤ª¤¤¤Æ²¼¤µ¤¤¡£¼¡¤Î¥ì¥Ã¥¹¥ó¤Ç»ÈÍѤ·¤Þ¤¹¡£ +NOTE: v ¤ò²¡¤¹¤È¡¢Visual ÁªÂò¤¬»Ï¤Þ¤ê¤Þ¤¹¡£¥«¡¼¥½¥ë¤òÆ°¤«¤¹¤³¤È¤Ç¡¢ÁªÂòÈϰϤò + Â礭¤¯¤â¾®¤µ¤¯¤â¤Ç¤­¤Þ¤¹¡£¤µ¤é¤Ë¡¢¤½¤ÎÁªÂòÈϰϤËÂФ·¤Æ¥ª¥Ú¥ì¡¼¥¿¤òŬÍÑ + ¤­¤Þ¤¹¡£Î㤨¤Ð d ¤Ï¥Æ¥­¥¹¥È¤òºï½ü¤·¤Þ¤¹¡£ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ¥ì¥Ã¥¹¥ó 5.4: ¥Õ¥¡¥¤¥ë¤Î¼è¹þ¤È¹çÊ» @@ -578,21 +672,21 @@ NOTE: ** ¥Õ¥¡¥¤¥ë¤ÎÃæ¿È¤òÁÞÆþ¤¹¤ë¤Ë¤Ï :r ¥Õ¥¡¥¤¥ë̾ ¤È¥¿¥¤¥×¤·¤Þ¤¹ ** - 1. Àè¤Û¤É¤Î TEST ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤¹¤ë¤³¤È¤ò³Î¤«¤á¤ë¤¿¤á¤Ë :!dir ¤È - ¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£ + 1. ¥«¡¼¥½¥ë¤ò°Ê²¼¤Î¹Ô¤Ë¹ç¤ï¤»¤Þ¤¹¡£ - 2. ¥«¡¼¥½¥ë¤ò¤³¤Î¥Ú¡¼¥¸¤ÎÀèƬ¤Ë°ÜÆ°¤·¤Þ¤¹¡£ +NOTE: ¥¹¥Æ¥Ã¥× 2 ¤Î¼Â¹Ô¸å¡¢¥ì¥Ã¥¹¥ó 5.3 ¤Î¥Æ¥­¥¹¥È¤¬¸½¤ì¤Þ¤¹¡£²¼¤Ë²¼¤¬¤Ã¤Æ¤³ + ¤Î¥ì¥Ã¥¹¥ó¤Ë°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ -NOTE: ¥¹¥Æ¥Ã¥× 3 ¤ò¼Â¹Ô¤¹¤ë¤È¡¢²èÌÌ¤Ë ¥ì¥Ã¥¹¥ó 5.3 ¤¬¸½¤ï¤ì¤ë¤Î¤Ç¡¢¥«¡¼¥½¥ë¤ò - ²¼¤Ë°ÜÆ°¤·¤³¤Î¥ì¥Ã¥¹¥ó¤Þ¤ÇÌá¤ê¤Þ¤·¤ç¤¦¡£ + 2. ¤Ç¤Ï TEST ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤ò :r TEST ¤È¤¤¤¦¥³¥Þ¥ó¥É¤ÇÆɤ߹þ¤ß¤Þ¤·¤ç¤¦¡£ + ¤³¤³¤Ç¤¤¤¦ TEST ¤Ï»È¤¦¥Õ¥¡¥¤¥ë¤Î̾Á°¤Î¤³¤È¤Ç¤¹¡£ + Æɤ߹þ¤Þ¤ì¤¿¥Õ¥¡¥¤¥ë¤Ï¡¢¥«¡¼¥½¥ë¹Ô¤Î²¼¤Ë¤¢¤ê¤Þ¤¹¡£ - 3. ¤Ç¤Ï¡¢:r TEST ¤È¥¿¥¤¥×¤·¤Æ TEST ¥Õ¥¡¥¤¥ë¤ò¼è¹þ¤ß¤Þ¤·¤ç¤¦¡£¤³¤Î TEST ¤Ï - ¥Õ¥¡¥¤¥ë̾¤Ç¤¹¡£ + 3. ¼è¹þ¤ó¤À¥Õ¥¡¥¤¥ë¤ò³Îǧ¤·¤Æ¤ß¤Þ¤·¤ç¤¦¡£¥«¡¼¥½¥ë¤òÌ᤹¤È¡¢¥ì¥Ã¥¹¥ó5.3 ¤Î + ¥ª¥ê¥¸¥Ê¥ë¤È¥Õ¥¡¥¤¥ë¤Ë¤è¤ë¤â¤Î¤Î2¤Ä¤¬¤¢¤ë¤³¤È¤¬¤ï¤«¤ê¤Þ¤¹¡£ -NOTE: ¥Õ¥¡¥¤¥ë¤Î¼è¹þ¤ß¤Ï¥«¡¼¥½¥ë¤Î°ÌÃÖ¤«¤é¹Ô¤ï¤ì¤Þ¤¹¡£ +NOTE: ³°Éô¥³¥Þ¥ó¥É¤Î½ÐÎϤòÆɤ߹þ¤à¤³¤È¤â½ÐÍè¤Þ¤¹¡£Î㤨¤Ð¡¢ + :r !ls ¤Ï ls ¥³¥Þ¥ó¥É¤Î½ÐÎϤò¥«¡¼¥½¥ë°Ê²¼¤ËÆɤ߹þ¤ß¤Þ¤¹¡£ - 4. ¼è¹þ¤ó¤À¥Õ¥¡¥¤¥ë¤ò³Îǧ¤·¤Æ¤ß¤Þ¤·¤ç¤¦¡£¥«¡¼¥½¥ë¤òÌ᤹¤È¡¢¥ì¥Ã¥¹¥ó5.3 ¤Î - ¥ª¥ê¥¸¥Ê¥ë¤È¥Õ¥¡¥¤¥ë¤Ë¤è¤ë¤â¤Î¤Î2¤Ä¤¬¤¢¤ë¤³¤È¤¬¤ï¤«¤ê¤Þ¤¹¡£ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -602,19 +696,19 @@ NOTE: 1. :!command ¤Ë¤è¤Ã¤Æ ³°Éô¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Þ¤¹¡£ ¤è¤¯»È¤¦Îã: - :!ls - ¥Ç¥£¥ì¥¯¥È¥ê¤Î¥Õ¥¡¥¤¥ë°ìÍ÷¤ò¸«¤ë¡£ - :!del ¥Õ¥¡¥¤¥ë̾ - ¥Õ¥¡¥¤¥ë̾¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤Îºï½ü¤¹¤ë¡£ + (MS-DOS) (Unix) + :!dir :!ls - ¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î°ìÍ÷¤ò¸«¤ë¡£ + :!del FILENAME :!rm FILENAME - ¥Õ¥¡¥¤¥ë¤òºï½ü¤¹¤ë¡£ 2. :w ¥Õ¥¡¥¤¥ë̾ ¤Ë¤è¤Ã¤Æ¥Õ¥¡¥¤¥ë̾¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬¥Ç¥£¥¹¥¯¤Ë½ñ¤­¹þ¤Þ¤ì¤ë¡£ - 3. :#,# w ¥Õ¥¡¥¤¥ë̾ ¤Ë¤è¤Ã¤Æ # ¤«¤é # ¤Þ¤Ç¤òÊݸ¤¹¤ë¡£ + 3. v ¥â¡¼¥·¥ç¥ó¤Ç :w FILENAME ¤È¤¹¤ë¤È¡¢¥Ó¥¸¥å¥¢¥ëÁªÂò¹Ô¤¬¥Õ¥¡¥¤¥ë¤ËÊݸ¤µ + ¤ì¤ë¡£ 4. :r ¥Õ¥¡¥¤¥ë̾ ¤Ë¤è¤ê¥Õ¥¡¥¤¥ë̾¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬¥Ç¥£¥¹¥¯¤è¤ê¼è¹þ¤Þ¤ì¡¢ ¥«¡¼¥½¥ë°ÌÃ֤β¼¤ËÁÞÆþ¤µ¤ì¤ë¡£ - - - + 5. :r !dir ¤Ï dir ¥³¥Þ¥ó¥É¤Î½ÐÎϤò¥«¡¼¥½¥ë°ÌÃְʲ¼¤ËÆɤ߹þ¤à¡£ @@ -624,18 +718,18 @@ NOTE: ** o ¤ò¥¿¥¤¥×¤¹¤ë¤È¡¢¥«¡¼¥½¥ë¤Î²¼¤Î¹Ô¤¬³«¤­¡¢ÁÞÆþ¥â¡¼¥É¤ËÆþ¤ê¤Þ¤¹ ** - 1. °Ê²¼¤Î ---> ¤Èµ­¤µ¤ì¤¿¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ + 1. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ 2. o (¾®Ê¸»ú) ¤ò¥¿¥¤¥×¤·¤Æ¡¢¥«¡¼¥½¥ë¤Î²¼¤Î¹Ô¤ò³«¤­¡¢ÁÞÆþ¥â¡¼¥É¤ËÆþ¤ê¤Þ¤¹¡£ - 3. ---> ¤Èµ­¤µ¤ì¤¿¹Ô¤ò¼Ì¤·¡¢ ¤È¥¿¥¤¥×¤·¤ÆÄɲå⡼¥É¤ò½ªÎ»¤·¤Þ¤·¤ç¤¦¡£ + 3. ¤µ¤é¤ËÁÞÆþ¥â¡¼¥É¤ò½ªÎ»¤¹¤ë°Ù¤Ë ¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£ ---> o ¤ò¥¿¥¤¥×¤¹¤ë¤È¥«¡¼¥½¥ë¤Ï³«¤¤¤¿¹Ô¤Ø°ÜÆ°¤·ÁÞÆþ¥â¡¼¥É¤ËÆþ¤ê¤Þ¤¹¡£ 4. ¥«¡¼¥½¥ë¤Î¾å¤Î¹Ô¤ËÁÞÆþ¤¹¤ë¤Ë¤Ï¡¢¾®Ê¸»ú¤Î o ¤Ç¤Ï¤Ê¤¯¡¢Ã±½ã¤ËÂçʸ»ú¤Î O ¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£¼¡¤Î¹Ô¤Ç»î¤·¤Æ¤ß¤Þ¤·¤ç¤¦¡£ -¤³¤Î¹Ô¤Î¾å¤ØÁÞÆþ¤¹¤ë¤Ë¤Ï¡¢¤³¤Î¹Ô¤Ø¥«¡¼¥½¥ë¤òÃÖ¤¤¤Æ Shift-O ¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£ +---> ¤³¤Î¹Ô¤Î¾å¤ØÁÞÆþ¤¹¤ë¤Ë¤Ï¡¢¤³¤Î¹Ô¤Ø¥«¡¼¥½¥ë¤òÃÖ¤¤¤Æ O ¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£ @@ -647,94 +741,118 @@ NOTE: ** ¥«¡¼¥½¥ë¤Î¼¡¤Î°ÌÃÖ¤«¤é¥Æ¥­¥¹¥È¤òÄɲ乤ë¤Ë¤Ï a ¤È¥¿¥¤¥×¤·¤Þ¤¹ ** - 1. ¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ë¤·¤Æ°Ê²¼¤Î ---> ¤Èµ­¤µ¤ì¤¿¤µ¤ì¤¿ºÇ½é¤Î¹Ô¤Ç $ ¤ò¥¿¥¤¥×¤· - ¤Æ¡¢½ªÃ¼¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ + 1. ¥«¡¼¥½¥ë¤ò ---> ¤Ç¼¨¤µ¤ì¤¿¶È¤Ø°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ - 2. ¥«¡¼¥½¥ë¤Îʸ»ú¤Î¸å¤í¤Ë¥Æ¥­¥¹¥È¤òÄɲ乤뤿¤á¤Ë a (¾®Ê¸»ú) ¤ò¥¿¥¤¥×¤·¤Þ - ¤¹¡£ + 2. e ¤ò²¡¤·¤Æ li ¤Î½ªÃ¼Éô¤Þ¤Ç¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤¹¡£ -NOTE: ¤³¤ì¤ÏºÇ¸å¤Îʸ»ú¤Ë¤Æ¥Æ¥­¥¹¥È¤òÁÞÆþ¤·¡¢ ¤ò¥¿¥¤¥×¤·¤Æ¥«¡¼¥½¥ë¤ò±¦¤Ë - °ÜÆ°¤·¡¢ºÇ¸å¤Ë x ¥¿¥¤¥×¤·¤Æ¹ÔËö¤ËÄɲ乤ë¤È¤¤¤Ã¤¿¤è¤¦¤Ê i ¤Î¥¿¥¤¥×¤ò - Èò¤±¤ë¤³¤È¤¬¤­¤Þ¤¹¡£ + 3. ¥«¡¼¥½¥ë¤Î¸å¤í¤Ë¥Æ¥­¥¹¥È¤òÄɲ乤뤿¤á¤Ë a (¾®Ê¸»ú) ¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£ - 3. ¤µ¤ÆºÇ½é¤Î¹Ô¤ò´°À®¤·¤Þ¤·¤ç¤¦¡£¥Æ¥­¥¹¥È¤¬ÁÞÆþ¤µ¤ì¤ë°ÌÃÖ¤ò½ü¤±¤Ð¡¢ - Äɲå³¥Þ¥ó¥É¤ÏÁÞÆþ¥â¡¼¥É¤È¤Þ¤Ã¤¿¤¯Æ±¤¸¤Ç¤¹¡£ + 4. ¤½¤Î²¼¤Î¹Ô¤Î¤Î¤è¤¦¤Êñ¸ì¤Ë´°À®¤µ¤»¤Þ¤¹¡£ÁÞÆþ¥â¡¼¥É¤òÈ´¤±¤ë°Ù¤Ë ¤Ë²¡ + ¤·¤Þ¤¹¡£ ----> ¤³¤Î¹Ô¤Ç¡¢¹ÔËö¤Ëʸ¾Ï¤òÄɲ乤ë ----> ¤³¤Î¹Ô¤Ç¡¢¹ÔËö¤Ëʸ¾Ï¤òÄɲ乤ëÎý½¬¤ò¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤Ç¤·¤ç¤¦¡£ + 5. e ¤ò»È¤Ã¤Æ¼¡¤ÎÉÔ´°Á´¤Êñ¸ì¤Ø°ÜÆ°¤·¡¢¥¹¥Æ¥Ã¥× 3 ¤È 4 ¤ò·«¤êÊÖ¤·¤Þ¤¹¡£ + +---> This li will allow you to pract appendi text to a line. +---> This line will allow you to practice appending text to a line. +Note: a, i ¤È A ¤ÏƱ¤¸ÁÞÆþ¥â¡¼¥É¤Ø°Ü¤ê¤Þ¤¹¤¬¡¢Ê¸»ú¤¬ÁÞÆþ¤µ¤ì¤ë°ÌÃÖ¤À¤±¤¬°Û¤Ê¤ê + ¤Þ¤¹¡£ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ¥ì¥Ã¥¹¥ó 6.3: ¤½¤Î¾¤ÎÃÖ´¹ + ¥ì¥Ã¥¹¥ó 6.3: ¤½¤Î¾¤ÎÃÖ´¹ÊýË¡ ** 1ʸ»ú°Ê¾å¤òÃÖ¤­´¹¤¨¤ë¤Ë¤ÏÂçʸ»ú¤Î R ¤È¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦ ** - 1. °Ê²¼¤Î ---> ¤Èµ­¤µ¤ì¤¿¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ - - 2. ---> ¤Èµ­¤µ¤ì¤¿£²¹ÔÌܤȰ㤦¡¢ºÇ½é¤Îñ¸ì¤ÎÀèƬ¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£ - (ñ¸ì 'last') + 1. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿¶È¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤¹¡£ºÇ½é¤Î xxx ¤ÎÀèƬ¤Ë°ÜÆ°¤· + ¤Þ¤¹¡£ - 3. ¤³¤³¤Ç R ¤ò¥¿¥¤¥×¤·¤Æ¡¢ºÇ½é¤Î¹Ô¤È¼¡¤Î¹Ô¤¬Æ±¤¸¤Ë¤Ê¤ë¤è¤¦¤Ë´û¸¤Î¥Æ¥­¥¹¥È - ¤Ø¾å½ñ¤­¥¿¥¤¥×¤·¡¢£±¹ÔÌܤλĤê¤ÎÉôʬ¤ò½ñ¤­´¹¤¨¤Þ¤·¤ç¤¦¡£ + 2. R ¤ò²¡¤·¤Æ¡¢2¹ÔÌܤοôÃͤò¥¿¥¤¥×¤¹¤ë¤³¤È¤Ç¡¢xxx ¤¬ÃÖ´¹¤µ¤ì¤Þ¤¹¡£ ----> To make the first line the same as the last on this page use the keys. ----> To make the first line the same as the second, type R and the new text. + 3. ÃÖ´¹¥â¡¼¥É¤òÈ´¤±¤ë¤Ë¤Ï ¤ò²¡¤·¤Þ¤¹¡£¹Ô¤Î»Ä¤ê¤¬Êѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤¤Þ¤Þ¤Ë + ¤Ê¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ - 4. ¥â¡¼¥É¤òÈ´¤±¤ë¤¿¤á¤Ë ¤ò¥¿¥¤¥×¤¹¤ë¤È¡¢Êѹ¹¤·¤Æ¤¤¤Ê¤¤Éôʬ¤¬»Ä¤ë¤³¤È - ¤ËÃí°Õ¤·¤Þ¤·¤ç¤¦¡£ + 5. »Ä¤Ã¤¿ xxx ¤ò¥¹¥Æ¥Ã¥×¤ò·«¤êÊÖ¤·¤ÆÃÖ´¹¤·¤Þ¤·¤ç¤¦¡£ +---> Adding 123 to xxx gives you xxx. +---> Adding 123 to 456 gives you 579. +NOTE: ÃÖ´¹¥â¡¼¥É¤ÏÁÞÆþ¥â¡¼¥É¤Ë»÷¤Æ¤¤¤Þ¤¹¤¬¡¢Á´¤Æ¤Î¥¿¥¤¥×¤µ¤ì¤¿Ê¸»ú¤Ï´û¸¤Îʸ»ú + ¤òºï½ü¤·¤Þ¤¹¡£ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ¥ì¥Ã¥¹¥ó 6.4: ¥ª¥×¥·¥ç¥ó¤ÎÀßÄê + ¥ì¥Ã¥¹¥ó 6.4: ¥Æ¥­¥¹¥È¤Î¥³¥Ô¡¼¤È¥Ú¡¼¥¹¥È + + ** ¥Æ¥­¥¹¥È¤Î¥³¥Ô¡¼¤Ë¤Ï¥ª¥Ú¥ì¡¼¥¿ y ¤ò¡¢¥Ú¡¼¥¹¥È¤Ë¤Ï p ¤ò»È¤¤¤Þ¤¹ ** - ** ¸¡º÷¤äÃÖ´¹¤ÎºÝ¤ËÂçʸ»ú¤È¾®Ê¸»ú¤ò̵»ë¤¹¤ëÍͤ˥ª¥×¥·¥ç¥ó¤òÀßÄꤷ¤Þ¤¹ ** + 1. ---> ¤È¼¨¤µ¤ì¤¿¹Ô¤Ø°ÜÆ°¤·¡¢¥«¡¼¥½¥ë¤ò "a)" ¤Î¸å¤ËÃÖ¤¤¤Æ¤ª¤­¤Þ¤¹¡£ + + 2. v ¤Ç¥Ó¥¸¥å¥¢¥ë¥â¡¼¥É¤ò³«»Ï¤·¡¢"first"¤Î¼êÁ°¤Þ¤Ç¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤¹¡£ + + 3. y ¤ò¥¿¥¤¥×¤·¤Æ¶¯Ä´É½¼¨¤µ¤ì¤¿¥Æ¥­¥¹¥È¤ò yank (¥³¥Ô¡¼)¤·¤Þ¤¹¡£ + 4. ¼¡¤Î¹Ô¤Î¹ÔËö¤Þ¤Ç¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤¹: j$ - 1. °Ê²¼¤ÎÍͤ˥¿¥¤¥×¤·¤Æ 'ignore' ¤ò¸¡º÷¤·¤Þ¤·¤ç¤¦: - /ignore + 5. p ¤ò²¡¤·¤ÆŽ¤êÉÕ¤±(put)¤Æ¤«¤é¡¢¼¡¤ò¥¿¥¤¥×¤·¤Þ¤¹: a second + + 6. ¥Ó¥¸¥å¥¢¥ë¥â¡¼¥É¤Ç " item." ¤òÁªÂò¤·¡¢y ¤Ç¥ä¥ó¥¯¡¢¼¡¤Î¹Ô¤Î¹ÔËö¤Þ¤Ç j$ ¤Ç + °ÜÆ°¤·¡¢ p ¤Ç¥Æ¥­¥¹¥È¤ò¤½¤³¤Ë put ¤·¤Þ¤¹¡£ + +---> a) this is the first item. + b) + + Note: ñ¸ì¤ò1¤Ä yank ¤¹¤ë¤Î¤Ë y ¤ò¥ª¥Ú¥ì¡¼¥¿¤È¤·¤Æ yw ¤È¤¹¤ë¤³¤È¤â½ÐÍè¤Þ¤¹¡£ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ¥ì¥Ã¥¹¥ó 6.5: ¥ª¥×¥·¥ç¥ó¤ÎÀßÄê + + + ** ¸¡º÷¤äÃÖ´¹¤ÎºÝ¤ËÂçʸ»ú/¾®Ê¸»ú¤ò̵»ë¤¹¤ë¤Ë¤Ï¡¢¥ª¥×¥·¥ç¥ó¤òÀßÄꤷ¤Þ¤¹ ** + + 1. ¼¡¤ÎÍͤËÆþÎϤ·¤Æ 'ignore' ¤ò¸¡º÷¤·¤Þ¤·¤ç¤¦: /ignore n ¤ò²¡¤·¤Æ²¿ÅÙ¤«¸¡º÷¤ò·«¤êÊÖ¤·¤Þ¤¹¡£ - 2. °Ê²¼¤ÎÍͤ˥¿¥¤¥×¤·¤Æ 'ic' (Ignore Case ¤Îά¤Ç¤¹) ¥ª¥×¥·¥ç¥ó¤òÀßÄꤷ¤Þ¤¹¡£ - :set ic + 2. ¼¡¤ÎÍͤËÆþÎϤ·¤Æ 'ic' (Ignore Case ¤Îά) ¥ª¥×¥·¥ç¥ó¤òÀßÄꤷ¤Þ¤¹: :set ic 3. ¤Ç¤Ï n ¤Ë¤è¤Ã¤Æ¤â¤¦1ÅÙ 'ignore' ¤ò¸¡º÷¤·¤Þ¤¹¡£ n ¤ò²¡¤·¤Æ¤µ¤é¤Ë¿ô²ó¸¡º÷¤ò·«¤êÊÖ¤·¤Þ¤·¤ç¤¦¡£ - 4. 'hlsearch' ¤È 'incsearch' ¥ª¥×¥·¥ç¥ó¤ò°Ê²¼¤ÎÍͤËÀßÄꤷ¤Þ¤·¤ç¤¦¡£ - :set hls is + 4. 'hlsearch' ¤È 'incsearch' ¥ª¥×¥·¥ç¥ó¤òÀßÄꤷ¤Þ¤·¤ç¤¦: :set hls is + + 5. ¸¡º÷¥³¥Þ¥ó¥É¤òºÆÆþÎϤ·¤Æ¡¢²¿¤¬µ¯¤³¤ë¤«¸«¤Æ¤ß¤Þ¤·¤ç¤¦: /ignore - 5. ¤â¤¦°ìÅÙ¸¡º÷¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Æ¡¢²¿¤¬µ¯¤³¤ë¤«¸«¤Æ¤ß¤Þ¤·¤ç¤¦: - /ignore + 6. Âçʸ»ú¾®Ê¸»ú¤Î¶èÊ̤ò̵¸ú¤Ë¤¹¤ë¤Ë¤Ï¼¡¤ÎÍͤËÆþÎϤ·¤Þ¤¹: :set noic +Note: ¥Þ¥Ã¥Á¤Î¶¯Ä´É½¼¨¤ò¤ä¤á¤ë¤Ë¤Ï¼¡¤ÎÍͤËÆþÎϤ·¤Þ¤¹: :nohlsearch +Note: 1¤Ä¤Î¸¡º÷¥³¥Þ¥ó¥É¤À¤±Âçʸ»ú¾®Ê¸»ú¤Î¶èÊ̤ò¤ä¤á¤¿¤¤¤Ê¤é¤Ð¡¢¥Õ¥ì¡¼¥º¤Ë \c + ¤ò»ÈÍѤ·¤Þ¤¹: /ignore\c ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ¥ì¥Ã¥¹¥ó 6 Í×Ìó - 1. o ¤ò¥¿¥¤¥×¤¹¤ë¤È¥«¡¼¥½¥ë¤Î²¼¤Î¹Ô¤ò³«¤±¤Æ¡¢¤½¤³¤ÇÁÞÆþ¥â¡¼¥É¤Ë¤Ê¤ë¡£ O (Âçʸ»ú) ¤ò¥¿¥¤¥×¤¹¤ë¤È¥«¡¼¥½¥ë¤Î¾å¤Î¹Ô¤ÇÁÞÆþ¥â¡¼¥É¤Ë¤Ê¤ë¡£ 2. ¥«¡¼¥½¥ë¾å¤Îʸ»ú¤Î¼¡¤«¤é¥Æ¥­¥¹¥È¤òÄɲ乤ë¤Ë¤Ï a ¤È¥¿¥¤¥×¤¹¤ë¡£ ¹ÔËö¤Ë¼«Æ°¤Ç¥Æ¥­¥¹¥È¤òÁÞÆþ¤¹¤ë¤Ë¤ÏÂçʸ»ú A ¤ò¥¿¥¤¥×¤¹¤ë¡£ - 3. Âçʸ»ú¤Î R ¤ò¥¿¥¤¥×¤¹¤ë¤ÈÃÖ´¹¥â¡¼¥É¤ËÆþ¤ê¡¢¤ò²¡¤¹¤ÈÈ´¤±¤ë¡£ - - 4. ":set xxx" ¤È¥¿¥¤¥×¤¹¤ë¤È¥ª¥×¥·¥ç¥ó "xxx" ¤¬ÀßÄꤵ¤ì¤ë¡£ - - - - - + 3. e ¥³¥Þ¥ó¥É¤Ïñ¸ì¤Î½ªÃ¼Éô¥«¡¼¥½¥ë¤ò°ÜÆ°¤¹¤ë¡£ + 4. y ¥ª¥Ú¥ì¡¼¥¿¤Ï¥Æ¥­¥¹¥È¤ò yank (¥³¥Ô¡¼)¤·¡¢p ¤Ï¤½¤ì¤ò put (¥Ú¡¼¥¹¥È)¤¹¤ë¡£ + 5. Âçʸ»ú¤Î R ¤ò¥¿¥¤¥×¤¹¤ë¤ÈÃÖ´¹¥â¡¼¥É¤ËÆþ¤ê¡¢¤ò²¡¤¹¤ÈÈ´¤±¤ë¡£ + 6. ":set xxx" ¤È¥¿¥¤¥×¤¹¤ë¤È¥ª¥×¥·¥ç¥ó "xxx" ¤¬ÀßÄꤵ¤ì¤ë¡£ + 'ic' 'ignorecase' ¸¡º÷»þ¤ËÂçʸ»ú¾®Ê¸»ú¤Î¶èÊ̤·¤Ê¤¤ + 'is' 'incsearch' ¸¡º÷¥Õ¥ì¡¼¥º¤ËÉôʬ¥Þ¥Ã¥Á¤·¤Æ¤¤¤ëÉôʬ¤òɽ¼¨¤¹¤ë + 'hls' 'hlsearch' ¥Þ¥Ã¥Á¤¹¤ë¤¹¤Ù¤ò¶¯Ä´É½¼¨¤¹¤ë + Ť¤Êý¡¢Ã»¤¤Êý¡¢¤É¤Á¤é¤Î¥ª¥×¥·¥ç¥ó̾¤Ç¤â»ÈÍѤǤ­¤Þ¤¹¡£ + 7. "no" ¤òÉÕÍ¿¤·¡¢¥ª¥×¥·¥ç¥ó¤ò̵¸ú¤Ë¤·¤Þ¤¹: :set noic ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ¥ì¥Ã¥¹¥ó 7: ¥ª¥ó¥é¥¤¥ó¥Ø¥ë¥×¥³¥Þ¥ó¥É + ¥ì¥Ã¥¹¥ó 7.1: ¥ª¥ó¥é¥¤¥ó¥Ø¥ë¥×¥³¥Þ¥ó¥É + ** ¥ª¥ó¥é¥¤¥ó¥Ø¥ë¥×¤ò»ÈÍѤ·¤Þ¤·¤ç¤¦ ** @@ -744,20 +862,19 @@ NOTE: - ¥­¡¼¤ò²¡¤¹(¤â¤·¤¢¤ë¤Ê¤é¤Ð)¡£ - :help ¤È¥¿¥¤¥×¤¹¤ë¡£ - ¥Ø¥ë¥×¥¦¥£¥ó¥É¥¦¤òÊĤ¸¤ë¤Ë¤Ï :q ¤È¥¿¥¤¥×¤·¤Þ¤¹¡£ + ¥Ø¥ë¥×¥¦¥£¥ó¥É¥¦¤Î¥Æ¥­¥¹¥È¤òÆɤà¤È¡¢¥Ø¥ë¥×¤ÎÆ°ºî¤¬Íý²ò¤Ç¤­¤Þ¤¹¡£ + CTRL-W CTRL-W ¤È¥¿¥¤¥×¤¹¤ë¤È ¥Ø¥ë¥×¥¦¥£¥ó¥É¥¦¤Ø¥¸¥ã¥ó¥×¤·¤Þ¤¹¡£ + :q ¤È¥¿¥¤¥×¤¹¤ë¤È ¥Ø¥ë¥×¥¦¥£¥ó¥É¥¦¤¬ÊĤ¸¤é¤ì¤Þ¤¹¡£ - ":help" ¥³¥Þ¥ó¥É¤Ë°ú¿ô¤òÍ¿¤¨¤ë¤³¤È¤Ë¤è¤ê¡¢¤¢¤é¤æ¤ëÂê̾¤Î¥Ø¥ë¥×¤ò¸«¤Ä¤±¤ë - ¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤ì¤é¤ò»î¤·¤Æ¤ß¤Þ¤·¤ç¤¦( ¤ò¥¿¥¤¥×¤·Ëº¤ì¤Ê¤¤¤è¤¦¤Ë): + ":help" ¥³¥Þ¥ó¥É¤Ë°ú¿ô¤òÍ¿¤¨¤ë¤³¤È¤Ë¤è¤ê¡¢¤¢¤é¤æ¤ëÂê̾¤Î¥Ø¥ë¥×¤ò¸«¤Ä¤±¤ë¤³¤È + ¤¬¤Ç¤­¤Þ¤¹¡£¤³¤ì¤é¤ò»î¤·¤Æ¤ß¤Þ¤·¤ç¤¦( ¤ò¥¿¥¤¥×¤·Ëº¤ì¤Ê¤¤¤è¤¦¤Ë): :help w :help c_ ¤Ç¥³¥Þ¥ó¥É¥é¥¤¥ó¤òÊä´°¤¹¤ë ** + + 1. ¥³¥ó¥Ñ¥Á¥â¡¼¥É¤Ç¤Ê¤¤¤³¤È¤ò³Îǧ¤·¤Þ¤¹: :set nocp + + 2. ¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ëºß¤ë¥Õ¥¡¥¤¥ë¤ò :!ls ¤« :!dir ¤Ç³Îǧ¤·¤Þ¤¹¡£ + + 3. ¥³¥Þ¥ó¥É¤Î³«»Ï¤ò¥¿¥¤¥×¤·¤Þ¤¹: :e + + 4. CTRL-D ¤ò²¡¤¹¤È Vim ¤Ï "e" ¤«¤é»Ï¤Þ¤ë¥³¥Þ¥ó¥É¤Î°ìÍ÷¤òɽ¼¨¤·¤Þ¤¹¡£ + + 5. ¤ò²¡¤¹¤È Vim ¤Ï ":edit" ¤È¤¤¤¦¥³¥Þ¥ó¥É̾¤òÊä´°¤·¤Þ¤¹¡£ + + 6. ¤µ¤é¤Ë¶õÇò¤È¡¢´û¸¤Î¥Õ¥¡¥¤¥ë̾¤Î»Ï¤Þ¤ê¤ò²Ã¤¨¤Þ¤¹: :edit FIL + + 7. ¤ò²¡¤¹¤È Vim ¤Ï̾Á°¤òÊä´°¤·¤Þ¤¹¡£(¤â¤·°ì¤Ä¤·¤«Ìµ¤«¤Ã¤¿¾ì¹ç) + +NOTE: Êä´°¤Ï¿¤¯¤Î¥³¥Þ¥ó¥É¤ÇÆ°ºî¤·¤Þ¤¹¡£¤½¤·¤Æ CTRL-D ¤È ²¡¤·¤Æ¤ß¤Æ¤¯¤À + ¤µ¤¤¡£ÆÃ¤Ë :help ¤ÎºÝ¤ËÌòΩ¤Á¤Þ¤¹¡£ + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ¥ì¥Ã¥¹¥ó 7 Í×Ìó + + + 1. ¥Ø¥ë¥×¥¦¥£¥ó¥É¥¦¤ò³«¤¯¤Ë¤Ï :help ¤È¤¹¤ë¤« ¤â¤·¤¯¤Ï ¤ò²¡¤¹¡£ + + 2. ¥³¥Þ¥ó¥É(cmd)¤Î¥Ø¥ë¥×¤ò¸¡º÷¤¹¤ë¤Ë¤Ï :help cmd ¤È¥¿¥¤¥×¤¹¤ë¡£ + + 3. Ê̤Υ¦¥£¥ó¥É¥¦¤Ø¥¸¥ã¥ó¥×¤¹¤ë¤Ë¤Ï CTRL-W CTRL-W ¤È¥¿¥¤¥×¤¹¤ë¡£ + + 4. ¥Ø¥ë¥×¥¦¥£¥ó¥É¥¦¤òÊĤ¸¤ë¤Ë¤Ï :q ¤È¥¿¥¤¥×¤¹¤ë¡£ + + 5. ¤ª¹¥¤ß¤ÎÀßÄê¤òÊÝ¤Ä¤Ë¤Ï vimrc µ¯Æ°¥¹¥¯¥ê¥×¥È¤òºîÀ®¤¹¤ë¡£ + + 6. : command ¤Ç²Äǽ¤ÊÊä´°¤ò¸«¤ë¤Ë¤Ï CTRL-D ¤ò¥¿¥¤¥×¤¹¤ë¡£ + Êä´°¤ò»ÈÍѤ¹¤ë¤Ë¤Ï ¤ò²¡¤¹¡£ + + + + + + + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ¤³¤ì¤Ë¤Æ Vim ¤Î¥Á¥å¡¼¥È¥ê¥¢¥ë¤ò½ª¤ï¤ê¤Þ¤¹¡£¥¨¥Ç¥£¥¿¤ò´Êñ¤Ë¡¢¤·¤«¤â½¼Ê¬¤Ë @@ -805,7 +968,8 @@ NOTE: Modified for Vim by Bram Moolenaar. - ÆüËܸìÌõ ¾¾ËÜÂÙ¹° E-mail:mattn@mail.goo.ne.jp + ÆüËܸìÌõ ¾¾ËÜ ÂÙ¹° + ´Æ½¤ ¼²¬ ÂÀϺ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - vi:set ts=8 sts=4 sw=4 tw=76: + vi:set ts=8 sts=4 sw=4 tw=78: diff --git a/runtime/tutor/tutor.ja.sjis b/runtime/tutor/tutor.ja.sjis index 3bc8a4c4a..3bb3c2c37 100644 --- a/runtime/tutor/tutor.ja.sjis +++ b/runtime/tutor/tutor.ja.sjis @@ -1,25 +1,26 @@ =============================================================================== -= V I M ‹³ –{ (ƒ`ƒ…[ƒgƒŠƒAƒ‹) ‚Ö ‚æ ‚¤ ‚± ‚» - Version 1.5 = += V I M ‹³ –{ (ƒ`ƒ…[ƒgƒŠƒAƒ‹) ‚Ö ‚æ ‚¤ ‚± ‚» - Version 1.7 = =============================================================================== - Vim ‚́A‚±‚̃`ƒ…[ƒgƒŠƒAƒ‹‚Åà–¾‚·‚é‚É‚Í‘½‚·‚¬‚é’ö‚̃Rƒ}ƒ“ƒh‚ð”õ‚¦‚½ - ”ñí‚É‹­—͂ȃGƒfƒBƒ^[‚Å‚·B‚±‚̃`ƒ…[ƒgƒŠƒAƒ‹‚́A‚ ‚È‚½‚ª Vim - ‚𖜔\ƒGƒfƒBƒ^[‚Æ‚µ‚ÄŽg‚¢‚±‚È‚¹‚é‚悤‚É‚È‚é‚̂ɏ\•ª‚ȃRƒ}ƒ“ƒh‚ɂ‚¢‚Ä - à–¾‚ð‚·‚é‚悤‚È‚Á‚Ä‚¢‚Ü‚·B + Vim ‚́A‚±‚̃`ƒ…[ƒgƒŠƒAƒ‹‚Åà–¾‚·‚é‚É‚Í‘½‚·‚¬‚é’ö‚̃Rƒ}ƒ“ƒh‚ð”õ‚¦‚½”ñí + ‚É‹­—͂ȃGƒfƒBƒ^[‚Å‚·B‚±‚̃`ƒ…[ƒgƒŠƒAƒ‹‚́A‚ ‚È‚½‚ª Vim ‚𖜔\ƒGƒfƒB + ƒ^[‚Æ‚µ‚ÄŽg‚¢‚±‚È‚¹‚é‚悤‚É‚È‚é‚̂ɏ\•ª‚ȃRƒ}ƒ“ƒh‚ɂ‚¢‚Äà–¾‚ð‚·‚é‚悤 + ‚È‚Á‚Ä‚¢‚Ü‚·B - ƒ`ƒ…[ƒgƒŠƒAƒ‹‚ðŠ®—¹‚·‚é‚Ì‚É•K—v‚ÈŽžŠÔ‚́AŠo‚¦‚½ƒRƒ}ƒ“ƒh‚ðŽŽ‚·‚Ì‚É‚Ç‚ê - ‚¾‚¯ŽžŠÔ‚ðŽg‚¤‚Ì‚©‚É‚à‚æ‚è‚Ü‚·‚ªA‚¨‚æ‚»25`30•ª‚Å‚·B + ƒ`ƒ…[ƒgƒŠƒAƒ‹‚ðŠ®—¹‚·‚é‚Ì‚É•K—v‚ÈŽžŠÔ‚́AŠo‚¦‚½ƒRƒ}ƒ“ƒh‚ðŽŽ‚·‚̂ɂǂꂾ + ‚¯ŽžŠÔ‚ðŽg‚¤‚Ì‚©‚É‚à‚æ‚è‚Ü‚·‚ªA‚¨‚æ‚»25‚©‚ç30•ª‚Å‚·B - Šw‚ÔƒRƒ}ƒ“ƒh‚É‚Í‚±‚Ì•¶Í‚ð•ÏX‚·‚é‚à‚Ì‚à‚ ‚è‚Ü‚·B—ûK‚ðŽn‚ß‚é‘O‚ɃR - ƒs[‚ðì¬‚µ‚Ü‚µ‚傤("vimtutor"‚µ‚½‚È‚ç‚΁AŠù‚ɃRƒs[‚³‚ê‚Ä‚¢‚Ü‚·)B + ATTENTION: + ˆÈ‰º‚Ì—ûK—pƒRƒ}ƒ“ƒh‚É‚Í‚±‚Ì•¶Í‚ð•ÏX‚·‚é‚à‚Ì‚à‚ ‚è‚Ü‚·B—ûK‚ðŽn‚ß‚é‘O + ‚ɃRƒs[‚ðì¬‚µ‚Ü‚µ‚傤("vimtutor"‚µ‚½‚È‚ç‚΁AŠù‚ɃRƒs[‚³‚ê‚Ä‚¢‚Ü‚·)B - ‚±‚̃`ƒ…[ƒgƒŠƒAƒ‹‚ªAŽg‚¤‚±‚Æ‚ÅŠo‚¦‚ç‚ê‚éŽd‘g‚Ý‚É‚È‚Á‚Ä‚¢‚邱‚Æ‚ðAS - ‚µ‚Ä‚¨‚©‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñB³‚µ‚­ŠwK‚·‚é‚ɂ̓Rƒ}ƒ“ƒh‚ðŽÀÛ‚ÉŽŽ‚³‚È‚¯ - ‚ê‚΂Ȃç‚È‚¢‚Ì‚Å‚·B•¶Í‚ð“Ç‚ñ‚¾‚¾‚¯‚È‚ç‚΁A‚«‚Á‚Æ–Y‚ê‚Ä‚µ‚Ü‚¢‚Ü‚·!B + ‚±‚̃`ƒ…[ƒgƒŠƒAƒ‹‚ªAŽg‚¤‚±‚Æ‚ÅŠo‚¦‚ç‚ê‚éŽd‘g‚Ý‚É‚È‚Á‚Ä‚¢‚邱‚Æ‚ðAS‚µ + ‚Ä‚¨‚©‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñB³‚µ‚­ŠwK‚·‚é‚ɂ̓Rƒ}ƒ“ƒh‚ðŽÀÛ‚ÉŽŽ‚³‚È‚¯‚ê‚Î + ‚È‚ç‚È‚¢‚Ì‚Å‚·B•¶Í‚ð“Ç‚ñ‚¾‚¾‚¯‚È‚ç‚΁A‚«‚Á‚Æ–Y‚ê‚Ä‚µ‚Ü‚¢‚Ü‚·!B - ‚³‚ŸACapsƒƒbƒN(Shift-Lock)ƒL[‚ª‰Ÿ‚³‚ê‚Ä‚¢‚È‚¢‚±‚Æ‚ðŠm”F‚µ‚½ŒãA - ‰æ–ʂɃŒƒbƒXƒ“1.1 ‚ª‘S•”•\Ž¦‚³‚ê‚é‚Æ‚±‚ë‚܂ŁAj ƒL[‚ð‰Ÿ‚µ‚ăJ[ƒ\ƒ‹‚ð - ˆÚ“®‚µ‚Ü‚µ‚傤B + ‚³‚ŸACapsƒƒbƒN(Shift-Lock)ƒL[‚ª‰Ÿ‚³‚ê‚Ä‚¢‚È‚¢‚±‚Æ‚ðŠm”F‚µ‚½ŒãA‰æ–Ê‚É + ƒŒƒbƒXƒ“1.1 ‚ª‘S•”•\Ž¦‚³‚ê‚é‚Æ‚±‚ë‚܂ŁAj ƒL[‚ð‰Ÿ‚µ‚ăJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü + ‚µ‚傤B ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ƒŒƒbƒXƒ“ 1.1: ƒJ[ƒ\ƒ‹‚̈ړ® @@ -33,15 +34,15 @@ 1. ˆÚ“®‚ÉŠµ‚ê‚é‚܂ŁAƒXƒNƒŠ[ƒ“‚ŃJ[ƒ\ƒ‹ˆÚ“®‚³‚¹‚Ü‚µ‚傤B 2. ‰º‚ւ̃L[(j)‚ð‰Ÿ‚µ‚‚¯‚é‚ƁA˜A‘±‚µ‚Ĉړ®‚Å‚«‚Ü‚·B ----> ‚±‚ê‚ÅŽŸ‚̃ŒƒbƒXƒ“‚Ɉړ®‚·‚é•û–@‚ª‚í‚©‚è‚Ü‚µ‚½‚ˁB + ‚±‚ê‚ÅŽŸ‚̃ŒƒbƒXƒ“‚Ɉړ®‚·‚é•û–@‚ª‚í‚©‚è‚Ü‚µ‚½‚ˁB 3. ‰º‚ւ̃L[‚ðŽg‚Á‚āAƒŒƒbƒXƒ“1.2 ‚Ɉړ®‚µ‚Ü‚µ‚傤B -NOTE: ‰½‚ðƒ^ƒCƒv‚µ‚Ä‚¢‚é‚©”»‚ç‚È‚­‚È‚Á‚½‚çA‚ð‰Ÿ‚µ‚ăm[ƒ}ƒ‹ƒ‚[ƒh‚É‚µ‚Ü - ‚·B‚»‚ê‚©‚ç“ü—Í‚µ‚悤‚Æ‚µ‚Ä‚¢‚½ƒRƒ}ƒ“ƒh‚ðÄ“ü—Í‚µ‚Ü‚µ‚傤B +Note: ‰½‚ðƒ^ƒCƒv‚µ‚Ä‚¢‚é‚©”»‚ç‚È‚­‚È‚Á‚½‚çA‚ð‰Ÿ‚µ‚ăm[ƒ}ƒ‹ƒ‚[ƒh‚É‚µ + ‚Ü‚·B‚»‚ê‚©‚ç“ü—Í‚µ‚悤‚Æ‚µ‚Ä‚¢‚½ƒRƒ}ƒ“ƒh‚ðÄ“ü—Í‚µ‚Ü‚µ‚傤B -NOTE: ƒJ[ƒ\ƒ‹ƒL[‚Å‚àˆÚ“®‚Å‚«‚Ü‚·B‚µ‚©‚µ hjkl ‚ðŽg—p‚·‚邱‚ƂɈê“xŠµ‚ê‚Ä‚µ‚Ü - ‚¦‚΁A‚Í‚é‚©‚É‘¬‚­ˆÚ“®‚·‚邱‚Æ‚ª‚Å‚«‚é‚Å‚µ‚傤B +Note: ƒJ[ƒ\ƒ‹ƒL[‚Å‚àˆÚ“®‚Å‚«‚Ü‚·B‚µ‚©‚µ hjkl ‚Ɉê“xŠµ‚ê‚Ä‚µ‚Ü‚¦‚΁A‚Í‚é‚© + ‚É‘¬‚­ˆÚ“®‚·‚邱‚Æ‚ª‚Å‚«‚é‚Å‚µ‚傤B‚¢‚âƒ}ƒW‚Å! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ƒŒƒbƒXƒ“ 1.2: VIM ‚Ì‹N“®‚ƏI—¹ @@ -52,27 +53,27 @@ NOTE: 1. ƒL[‚ð‰Ÿ‚µ‚Ü‚µ‚傤B(ŠmŽÀ‚Ƀm[ƒ}ƒ‹ƒ‚[ƒh‚É‚·‚邽‚ß) 2. ŽŸ‚̂悤‚Ƀ^ƒCƒv: :q! + ‚±‚ê‚É‚æ‚è•ÒW‚µ‚½“à—e‚ð•Û‘¶‚¹‚¸‚ɃGƒfƒBƒ^‚ªI—¹‚µ‚Ü‚·B ----> ‚±‚ê‚É‚æ‚è•ÒW‚µ‚½“à—e‚ð•Û‘¶‚¹‚¸‚ɃGƒfƒBƒ^‚ªI—¹‚µ‚Ü‚·B - •ÒW“à—e‚ð•Û‘¶‚µ‚ďI—¹‚·‚é‚Æ‚«‚ÍŽŸ‚̂悤‚Ƀ^ƒCƒv‚µ‚Ü‚·: - :wq - - 3. ƒVƒFƒ‹ƒvƒƒ“ƒvƒg‚©‚çƒ`ƒ…[ƒgƒŠƒAƒ‹‚ðŽn‚ß‚é‚ɂ̓Rƒ}ƒ“ƒh‚ðƒ^ƒCƒv‚µ‚Ü‚·B + 3. ƒVƒFƒ‹ƒvƒƒ“ƒvƒg‚ªo‚Ä‚«‚½‚çA‚±‚̃`ƒ…[ƒgƒŠƒAƒ‹‚ðŽn‚ß‚éˆ×‚ɂɃRƒ}ƒ“ƒh + ‚ðƒ^ƒCƒv‚µ‚Ü‚·B ‚»‚̃Rƒ}ƒ“ƒh‚Í: vimtutor - ’ʏí‚Í‚±‚¤‚Å‚µ‚傤: vim tutor - ----> 'vim' ‚Í Vim ƒGƒfƒBƒ^‚Ì‹N“®‚ðA'tutor' ‚͕ҏW‚µ‚½‚¢ƒtƒ@ƒCƒ‹‚ðˆÓ–¡‚µ‚Ü‚·B 4. ‚±‚ê‚܂ł̃Xƒeƒbƒv‚ðŠo‚¦Ž©M‚ª‚‚¢‚½‚È‚ç‚΁AƒXƒeƒbƒv 1 ‚©‚ç 3 ‚Ü‚Å‚ðŽÀ - Û‚ÉŽŽ‚µ‚āAVim ‚ð1“xI—¹‚µ‚Ä‚©‚çÄ‚Ñ‹N“®‚µ‚Ü‚µ‚傤B‚»‚ê‚©‚烌ƒbƒXƒ“ - 1.3‚܂ŃJ[ƒ\ƒ‹‚ðˆÚ“®‚³‚¹‚Ü‚µ‚傤B + Û‚ÉŽŽ‚µ‚āAVim ‚ð1“xI—¹‚µ‚Ä‚©‚çÄ‚Ñ‹N“®‚µ‚Ü‚µ‚傤B + +NOTE: :q! ‚Í‘S‚Ă̕ύX‚ð”jŠü‚µ‚Ü‚·BƒŒƒbƒXƒ“‚ɂĕύX‚ðƒtƒ@ƒCƒ‹‚É•Û + ‘¶‚·‚é•û–@‚ɂ‚¢‚Ä‚à•×‹­‚µ‚Ä‚¢‚«‚Ü‚µ‚傤B + + 5. 1.3‚܂ŃJ[ƒ\ƒ‹‚ðˆÚ“®‚³‚¹‚Ü‚µ‚傤B + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ƒŒƒbƒXƒ“ 1.3: ƒeƒLƒXƒg•ÒW - íœ ** ƒm[ƒ}ƒ‹ƒ‚[ƒh‚ɂăJ[ƒ\ƒ‹‚̉º‚Ì•¶Žš‚ðíœ‚·‚é‚É‚Í x ‚ð‰Ÿ‚µ‚Ü‚· ** - 1. ˆÈ‰º‚Ì ---> ‚Æ‹L‚³‚ꂽ‚³‚ꂽs‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B + 1. ˆÈ‰º‚Ì ---> ‚ÆŽ¦‚³‚ꂽs‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B 2. ŠÔˆá‚¢‚ðC³‚·‚邽‚߂ɁAíœ‚·‚éÅ‰‚Ì•¶Žš‚܂ŃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚·B @@ -82,7 +83,7 @@ NOTE: ---> ‚»‚Ì ‚¤‚¤‚³‚¬ ‚Í ‚‚‚«‚« ‚ð ‚±‚¦‚¦‚Ä‚Ä ‚Æ‚Ñ‚Í‚Ë‚½‚½ - 5. s‚ª³‚µ‚­‚È‚Á‚½‚çAƒŒƒbƒXƒ“ 1.4 ‚Ɉڂè‚Ü‚µ‚傤B + 5. s‚ª³‚µ‚­‚È‚Á‚½‚çAƒŒƒbƒXƒ“ 1.4 ‚֐i‚Ý‚Ü‚µ‚傤B NOTE: ‘S‚ẴŒƒbƒXƒ“‚ð’Ê‚¶‚āAŠo‚¦‚悤‚Æ‚·‚é‚Ì‚Å‚Í‚È‚­ŽÀÛ‚É‚â‚Á‚Ä‚Ý‚Ü‚µ‚傤B @@ -95,15 +96,15 @@ NOTE: ** ƒm[ƒ}ƒ‹ƒ‚[ƒh‚ɂăeƒLƒXƒg‚ð‘}“ü‚·‚é‚É‚Í i ‚ð‰Ÿ‚µ‚Ü‚· ** - 1. ˆÈ‰º‚Ì ---> ‚Æ‹L‚³‚ꂽ‚³‚ꂽÅ‰‚̍s‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B + 1. ˆÈ‰º‚Ì ---> ‚ÆŽ¦‚³‚ꂽÅ‰‚̍s‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B - 2. 1s–Ú‚ð2s–Ú‚Æ“¯‚¶—l‚É‚·‚邽‚߂ɁAƒeƒLƒXƒg‚ð‘}“ü‚µ‚È‚¯‚ê‚΂Ȃç‚È‚¢ˆÊ - ’u‚ÌŽŸ‚Ì•¶Žš‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚·B + 2. 1s–Ú‚ð2s–Ú‚Æ“¯‚¶—l‚É‚·‚邽‚߂ɁAƒeƒLƒXƒg‚ð‘}“ü‚µ‚È‚¯‚ê‚΂Ȃç‚È‚¢ˆÊ’u + ‚ÌŽŸ‚Ì•¶Žš‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚·B 3. i ƒL[‚ð‰Ÿ‚µ‚Ä‚©‚çA’ljÁ‚ª•K—v‚È•¶Žš‚ðƒ^ƒCƒv‚µ‚Ü‚µ‚傤B - 4. ŠÔˆá‚¢‚ðC³‚µ‚½‚ç ‚ð‰Ÿ‚µ‚ăRƒ}ƒ“ƒhƒ‚[ƒh‚É–ß‚èA³‚µ‚¢•¶‚É - ‚È‚é—l‚ɃXƒeƒbƒv 2 ‚©‚ç 4 ‚ðŒJ‚è•Ô‚µ‚Ü‚µ‚傤B + 4. ŠÔˆá‚¢‚ðC³‚µ‚½‚ç ‚ð‰Ÿ‚µ‚ăRƒ}ƒ“ƒhƒ‚[ƒh‚É–ß‚èA³‚µ‚¢•¶‚É‚È‚é—l + ‚ɃXƒeƒbƒv 2 ‚©‚ç 4 ‚ðŒJ‚è•Ô‚µ‚Ü‚µ‚傤B ---> ‚±‚Ì ‚É‚Í ‘«‚è‚È‚¢ ƒeƒLƒXƒg ‚ ‚éB ---> ‚±‚Ì s ‚É‚Í Šô‚‚© ‘«‚è‚È‚¢ ƒeƒLƒXƒg ‚ª ‚ ‚éB @@ -112,6 +113,52 @@ NOTE: +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ƒŒƒbƒXƒ“ 1.5: ƒeƒLƒXƒg•ÒW - ’ljÁ + + + ** ƒeƒLƒXƒg’ljÁ‚·‚é‚É‚Í A ‚ð‰Ÿ‚µ‚Ü‚µ‚傤 ** + + 1. ˆÈ‰º‚Ì ---> ‚ÆŽ¦‚³‚ꂽÅ‰‚̍s‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B + ƒJ[ƒ\ƒ‹‚ª‚»‚Ì•¶Žšã‚É‚ ‚Á‚Ä‚à‚©‚Ü‚¢‚Ü‚¹‚ñB + + 2. ’ljÁ‚ª•K—v‚ȏꏊ‚Å A ‚ðƒ^ƒCƒv‚µ‚Ü‚µ‚傤B + + 3. ƒeƒLƒXƒg‚ð’ljÁ‚µI‚¦‚½‚çA ‚ð‰Ÿ‚µ‚ăm[ƒ}ƒ‹ƒ‚[ƒh‚É–ß‚è‚Ü‚µ‚傤B + + 4. 2s–Ú‚Ì ---> ‚ÆŽ¦‚³‚ꂽêŠ‚ÖˆÚ“®‚µAƒXƒeƒbƒv 2 ‚©‚ç 3 ŒJ‚è•Ô‚µ‚Ä•¶–@‚ð + C³‚µ‚Ü‚µ‚傤B + +---> ‚±‚±‚É‚ÍŠÔˆá‚Á‚½ƒeƒLƒXƒg‚ª‚ ‚è + ‚±‚±‚É‚ÍŠÔˆá‚Á‚½ƒeƒLƒXƒg‚ª‚ ‚è‚Ü‚·B +---> ‚±‚±‚É‚àŠÔˆá‚Á‚½ƒeƒLƒX + ‚±‚±‚É‚àŠÔˆá‚Á‚½ƒeƒLƒXƒg‚ª‚ ‚è‚Ü‚·B + + 5. ƒeƒLƒXƒg‚̒ljÁ‚ªŒy‰õ‚É‚È‚Á‚Ä‚«‚½‚烌ƒbƒXƒ“ 1.6 ‚֐i‚Ý‚Ü‚µ‚傤B + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ƒŒƒbƒXƒ“ 1.6: ƒtƒ@ƒCƒ‹‚̕ҏW + + + ** ƒtƒ@ƒCƒ‹‚ð•Û‘¶‚µ‚ďI—¹‚·‚é‚É‚Í :wq ‚ƃ^ƒCƒv‚µ‚Ü‚· ** + + !! NOTE: ˆÈ‰º‚̃Xƒeƒbƒv‚ðŽÀs‚·‚é‘O‚ɁA‚Ü‚¸‘S‘Ì‚ð“Ç‚ñ‚Å‚­‚¾‚³‚¢!! + + 1. ƒŒƒbƒXƒ“ 1.2 ‚Å‚â‚Á‚½‚悤‚É :q! ‚ðƒ^ƒCƒv‚µ‚āA‚±‚̃`ƒ…[ƒgƒŠƒAƒ‹‚ðI—¹ + ‚µ‚Ü‚·B + + 2. ƒVƒFƒ‹ƒvƒƒ“ƒvƒg‚Å‚±‚̃Rƒ}ƒ“ƒh‚ðƒ^ƒCƒv‚µ‚Ü‚·: vim tutor + 'vim'‚ª Vim ƒGƒfƒBƒ^‚ð‹N“®‚·‚éƒRƒ}ƒ“ƒhA'tutor' ‚͕ҏW‚µ‚½‚¢ƒtƒ@ƒCƒ‹‚Ì + –¼‘O‚Å‚·B•ÏX‚µ‚Ä‚à‚æ‚¢ƒtƒ@ƒCƒ‹‚ðŽg‚¢‚Ü‚µ‚傤B + + 3. ‘O‚̃ŒƒbƒXƒ“‚ÅŠw‚ñ‚¾‚悤‚ɁAƒeƒLƒXƒg‚ð‘}“üAíœ‚µ‚Ü‚·B + + 4. •ÏX‚ðƒtƒ@ƒCƒ‹‚É•Û‘¶‚µ‚Ü‚·: :wq + + 5. vimtutor ‚ðÄ“x‹N“®‚µAˆÈ‰º‚Ì—v–ñ‚֐i‚Ý‚Ü‚µ‚傤B + + 6. ˆÈã‚̃Xƒeƒbƒv‚ð“Ç‚ñ‚Å—‰ð‚µ‚½ã‚Å‚±‚ê‚ðŽÀs‚µ‚Ü‚µ‚傤B + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ƒŒƒbƒXƒ“ 1 —v–ñ @@ -127,14 +174,14 @@ NOTE: 4. ƒJ[ƒ\ƒ‹‚̉º‚Ì•¶Žš‚ðíœ‚·‚é‚ɂ́Aƒm[ƒ}ƒ‹ƒ‚[ƒh‚Å x ‚ƃ^ƒCƒv‚µ‚Ü‚·B 5. ƒJ[ƒ\ƒ‹‚̈ʒu‚É•¶Žš‚ð‘}“ü‚·‚é‚ɂ́Aƒm[ƒ}ƒ‹ƒ‚[ƒh‚Å i ‚ƃ^ƒCƒv‚µ‚Ü‚·B - i ƒeƒLƒXƒg‚̃^ƒCƒv + i ƒeƒLƒXƒg‚̃^ƒCƒv ƒJ[ƒ\ƒ‹ˆÊ’u‚ɒljÁ + A ƒeƒLƒXƒg‚̒ljÁ s––‚ɒljÁ -NOTE: ƒL[‚ð‰Ÿ‚·‚ƃm[ƒ}ƒ‹ƒ‚[ƒh‚Ɉڍs‚µ‚Ü‚·B‚»‚̍ہAŠÔˆá‚Á‚½‚è“ü—Í“r’† - ‚̃Rƒ}ƒ“ƒh‚ðŽæ‚èÁ‚·‚±‚Æ‚ª‚Å‚«‚Ü‚·B +NOTE: ƒL[‚ð‰Ÿ‚·‚ƃm[ƒ}ƒ‹ƒ‚[ƒh‚Ɉڍs‚µ‚Ü‚·B‚»‚̍ہAŠÔˆá‚Á‚½‚è“ü—Í“r + ’†‚̃Rƒ}ƒ“ƒh‚ðŽæ‚èÁ‚·‚±‚Æ‚ª‚Å‚«‚Ü‚·B ‚³‚āA‘±‚¯‚ăŒƒbƒXƒ“ 2 ‚ðŽn‚ß‚Ü‚µ‚傤B - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ƒŒƒbƒXƒ“ 2.1: íœƒRƒ}ƒ“ƒh @@ -143,7 +190,7 @@ NOTE: 1. ƒm[ƒ}ƒ‹ƒ‚[ƒh‚Å‚ ‚邱‚Æ‚ðŠm”F‚·‚邽‚ß‚É ‚ð‰Ÿ‚µ‚Ü‚µ‚傤B - 2. ˆÈ‰º‚Ì ---> ‚Æ‹L‚³‚ꂽ‚³‚ꂽs‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B + 2. ˆÈ‰º‚Ì ---> ‚ÆŽ¦‚³‚ꂽs‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B 3. Á‚µ‚½‚¢’PŒê‚̐擪‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B @@ -154,7 +201,7 @@ NOTE: ---> ‚±‚Ì •¶ Ž† ‚É‚Í ‚¢‚­‚‚©‚Ì ‚½‚Ì‚µ‚¢ •K—v‚Ì‚È‚¢ ’PŒê ‚ª ŠÜ‚Ü‚ê‚Ä ‚¢‚Ü‚·B - 5. 3 ‚©‚ç 4 ‚܂ł𕶂ª³‚µ‚­‚È‚é‚Ü‚ÅŒJ‚è•Ô‚µAƒŒƒbƒXƒ“ 2.2 ‚Ɉڂè‚Ü‚µ‚傤B + 5. 3 ‚©‚ç 4 ‚܂ł𕶂ª³‚µ‚­‚È‚é‚Ü‚ÅŒJ‚è•Ô‚µAƒŒƒbƒXƒ“ 2.2 ‚֐i‚Ý‚Ü‚µ‚傤B @@ -166,7 +213,7 @@ NOTE: 1. ƒm[ƒ}ƒ‹ƒ‚[ƒh‚Å‚ ‚邱‚Æ‚ðŠm”F‚·‚é‚Ì‚É ‚ð‰Ÿ‚µ‚Ü‚µ‚傤B - 2. ˆÈ‰º‚Ì ---> ‚Æ‹L‚³‚ꂽ‚³‚ꂽs‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B + 2. ˆÈ‰º‚Ì ---> ‚ÆŽ¦‚³‚ꂽs‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B 3. ³‚µ‚¢•¶‚Ì––”ö‚ÖƒJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤(Å‰‚Ì . ‚ÌŒã‚Å‚·)B @@ -175,77 +222,123 @@ NOTE: ---> ’N‚©‚ª‚±‚̍s‚̍Ōã‚ð2“xƒ^ƒCƒv‚µ‚Ü‚µ‚½B 2“xƒ^ƒCƒv‚µ‚Ü‚µ‚½B - 5. ‚Ç‚¤‚¢‚¤‚±‚Æ‚©—‰ð‚·‚邽‚߂ɁAƒŒƒbƒXƒ“ 2.3 ‚ÖˆÚ‚è‚Ü‚µ‚傤B + 5. ‚Ç‚¤‚¢‚¤‚±‚Æ‚©—‰ð‚·‚邽‚߂ɁAƒŒƒbƒXƒ“ 2.3 ‚֐i‚Ý‚Ü‚µ‚傤B ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Lesson 2.3: ƒRƒ}ƒ“ƒh‚Æ–Ú“IŒê + ƒŒƒbƒXƒ“ 2.3: ƒIƒyƒŒ[ƒ^‚ƃ‚[ƒVƒ‡ƒ“ + + ‘½‚­‚̃Rƒ}ƒ“ƒh‚̓IƒyƒŒ[ƒ^‚ƃ‚[ƒVƒ‡ƒ“‚©‚çƒeƒLƒXƒg‚ɕύX‚ð‰Á‚Ü‚·B + íœƒRƒ}ƒ“ƒh d ‚̃IƒyƒŒ[ƒ^‚ÍŽŸ‚Ì—l‚É‚È‚Á‚Ä‚¢‚Ü‚·: - íœƒRƒ}ƒ“ƒh d ‚ÌŒ`Ž®‚ÍŽŸ‚Ì—l‚É‚È‚Á‚Ä‚¢‚Ü‚·: + d ƒ‚[ƒVƒ‡ƒ“ - [‰ñ”] d –Ú“IŒê ‚à‚µ‚­‚Í d [‰ñ”] –Ú“IŒê ‚»‚ꂼ‚ê: - ‰ñ” - ‚»‚̃Rƒ}ƒ“ƒh‚ð‰½‰ñŒJ‚è•Ô‚·‚©(È—ª‰Â”\, È—ª‚µ‚½Žž‚Í =1)B - d - íœƒRƒ}ƒ“ƒhB - –Ú“IŒê - ‰½‚ɑ΂µ‚Ä“­‚«‚©‚¯‚é‚©(ˆÈ‰º‚É‹“‚°‚Ü‚·)B + d - íœƒRƒ}ƒ“ƒhB + ƒ‚[ƒVƒ‡ƒ“ - ‰½‚ɑ΂µ‚Ä“­‚«‚©‚¯‚é‚©(ˆÈ‰º‚É‹“‚°‚Ü‚·)B - –Ú“IŒêˆê——: + ƒIƒyƒŒ[ƒ^‚̈ꕔˆê——: w - ƒJ[ƒ\ƒ‹ˆÊ’u‚©‚ç‹ó”’‚ðŠÜ‚Þ’PŒê‚Ì––”ö‚܂ŁB e - ƒJ[ƒ\ƒ‹ˆÊ’u‚©‚ç‹ó”’‚ðŠÜ‚Ü‚È‚¢’PŒê‚Ì––”ö‚܂ŁB $ - ƒJ[ƒ\ƒ‹ˆÊ’u‚©‚çs––‚܂ŁB -NOTE: –`Œ¯‚µ‚½‚¢l‚́Aƒm[ƒ}ƒ‹ƒ‚[ƒh‚ɂăRƒ}ƒ“ƒh‚È‚µ‚É–Ú“IŒê‚ð‰Ÿ‚µ‚Ä + ‚‚܂è de ‚ƃ^ƒCƒv‚·‚é‚ƁAƒJ[ƒ\ƒ‹ˆÊ’u‚©‚ç’PŒê‚̏I‚í‚è‚Ü‚Å‚ðíœ‚µ‚Ü‚·B + +NOTE: –`Œ¯‚µ‚½‚¢l‚́Aƒm[ƒ}ƒ‹ƒ‚[ƒh‚ɂăRƒ}ƒ“ƒh‚È‚µ‚Ƀ‚[ƒVƒ‡ƒ“‚ð‰Ÿ‚µ‚Ä ‚Ý‚Ü‚µ‚傤BƒJ[ƒ\ƒ‹‚ª–Ú“IŒêˆê——‚ÅŽ¦‚³‚ê‚éˆÊ’u‚Ɉړ®‚·‚é‚Í‚¸‚Å‚·B +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ƒŒƒbƒXƒ“ 2.4: ƒ‚[ƒVƒ‡ƒ“‚ɃJƒEƒ“ƒg‚ðŽg—p‚·‚é + + + ** ‰½‰ñ‚às‚¢‚½‚¢ŒJ‚è•Ô‚µ‚̃‚[ƒVƒ‡ƒ“‚Ì‘O‚ɐ”’l‚ðƒ^ƒCƒv‚µ‚Ü‚·B ** + + 1. ˆÈ‰º‚Ì ---> ‚ÆŽ¦‚³‚ꂽ‹Æ‚̐擪‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚·B + + 2. 2dw ‚ðƒ^ƒCƒv‚µ‚Ä’PŒê2‚•ªˆÚ“®‚µ‚Ü‚·B + + 3. 3e ‚ðƒ^ƒCƒv‚µ‚Ä3‚–ڂ̒PŒê‚̏I’[‚Ɉړ®‚µ‚Ü‚·B + + 4. 0 (ƒ[ƒ)‚ðƒ^ƒCƒv‚µ‚čs“ª‚Ɉړ®‚µ‚Ü‚·B + + 5. ƒXƒeƒbƒv 2 ‚Æ 3 ‚ðˆá‚¤”’l‚ÆŽg‚Á‚ÄŒJ‚è•Ô‚µ‚Ü‚·B + +---> This is just a line with words you can move around in. + + 6. ƒŒƒbƒXƒ“ 2.5 ‚ɐi‚Ý‚Ü‚µ‚傤B + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ƒŒƒbƒXƒ“ 2.4: ‚»‚êˆÈŠO‚ÌŒ`‚̃Rƒ}ƒ“ƒh + ƒŒƒbƒXƒ“ 2.5: ‚æ‚葽‚­‚ðíœ‚·‚邽‚߂ɃJƒEƒ“ƒg‚ðŽg—p‚·‚é + + + ** ƒIƒyƒŒ[ƒ^‚ƃJƒEƒ“ƒg‚ðƒ^ƒCƒv‚·‚é‚ƁA‚»‚Ì‘€ì‚ª•¡”‰ñŒJ‚è•Ô‚³‚ê‚Ü‚·B ** + + Šùq‚̍폜‚̃IƒyƒŒ[ƒ^‚ƃ‚[ƒVƒ‡ƒ“‚Ì‘g‚ݍ‡‚킹‚ɃJƒEƒ“ƒg‚ð’ljÁ‚·‚邱‚ƂŁA + ‚æ‚葽‚­‚̍폜‚ªs‚¦‚Ü‚·: + d ”’l ƒ‚[ƒVƒ‡ƒ“ + + 1. ---> ‚ÆŽ¦‚³‚ꂽs‚̍s“ª•”•ª‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B + + 2. UPPER CASE ‚Ì’PŒê2‚‚ð 2dw ‚ƃ^ƒCƒv‚µ‚č폜‚µ‚Ü‚·B + + 3. UPPER CASE ‚Æ‚¢‚¤˜A‘±‚µ‚½’PŒê‚ðA1‚‚̃Rƒ}ƒ“ƒh‚ƈقȂéƒJƒEƒ“ƒg‚ðŽw’肵A + ƒXƒeƒbƒv 1 ‚Æ 2 ‚ðŒJ‚è•Ô‚µ‚Ü‚·B + +---> ‚±‚ÌABC DEs‚ÌFGHI JK LMN OP’PŒê‚ÍQ RS TUVãY—í‚É‚È‚Á‚½B + +NOTE: ƒIƒyƒŒ[ƒ^ d ‚ƃ‚[ƒVƒ‡ƒ“‚̊ԂɃJƒEƒ“ƒg‚ðŽg‚Á‚½ê‡AƒIƒyƒŒ[ƒ^‚Ì‚È‚¢ + ê‡‚̃‚[ƒVƒ‡ƒ“‚̂悤‚É“®ì‚µ‚Ü‚·B + —á: 3dw ‚Æ d3w ‚Í“¯“™‚ŁA3w ‚ðíœ‚µ‚Ü‚·B + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ƒŒƒbƒXƒ“ 2.6: s‚Ì‘€ì + + ** s‘S‘Ì‚ðíœ‚·‚é‚É‚Í dd ‚ƃ^ƒCƒv‚µ‚Ü‚· ** - ** s‘S‘Ì‚ðíœ‚·‚é‚É‚Í dd ‚ƃ^ƒCƒv‚µ‚Ü‚µ‚傤 ** + s‘S‘Ì‚ðíœ‚·‚é•p“x‚ª‘½‚¢‚̂ŁAVi‚̃fƒUƒCƒi[‚͍s‚̍폜‚ð d ‚Ì2‰ñƒ^ƒCƒv‚Æ + ‚¢‚¤ŠÈ’P‚È‚à‚Ì‚ÉŒˆ‚ß‚Ü‚µ‚½B - s‘S‘̂̍폜‚Í•p”ɂɍs‚È‚¤ì‹Æ‚Ȃ̂ŁAVim ‚̐݌vŽÒ‚͍s‚ðíœ‚·‚é‚̂ɂ́A - ’P‚É—ñ“à‚É‚Ä2‰ñ d ‚ðƒ^ƒCƒv‚·‚é•û‚ªŠÈ’P‚¾‚낤‚Æ”»’f‚µ‚Ü‚µ‚½B + 1. ˆÈ‰º‚Ì‹å‚Ì2s–ڂɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚·B + 2. dd ‚ƃ^ƒCƒv‚µ‚čs‚ðíœ‚µ‚Ü‚·B + 3. ‚³‚ç‚É4s–ڂɈړ®‚µ‚Ü‚·B + 4. 2dd ‚ƃ^ƒCƒv‚µ‚Ä2s‚ðíœ‚µ‚Ü‚·B - 1. ‰º‚É‚ ‚éˆê˜A‚̃tƒŒ[ƒY‚Ì2s–ڂɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B - 2. dd ‚ƃ^ƒCƒv‚µ‚čs‚ðíœ‚µ‚Ü‚µ‚傤B - 3. ‚Å‚Í4s–ڂɈړ®‚µ‚Ä‚Ý‚Ü‚µ‚傤B - 4. 2dd ‚ƃ^ƒCƒv‚µ‚Ä2síœ‚µ‚Ä‚Ý‚Ü‚µ‚傤B - (‰ñ”-ƒRƒ}ƒ“ƒh-–Ú“IŒê ‚ÌŒ`Ž®‚ðŽv‚¢o‚µ‚Ü‚µ‚傤) +---> 1) ƒoƒ‰‚͐Ԃ¢A +---> 2) ‚‚܂ç‚È‚¢‚à‚Ì‚ÍŠy‚µ‚¢A +---> 3) ƒXƒ~ƒŒ‚͐‚¢A +---> 4) Ž„‚ÍŽÔ‚ð‚à‚Á‚Ä‚¢‚éA +---> 5) ŽžŒv‚ªŽž‚ð‚°‚éA +---> 6) »“œ‚͊¢ +---> 7) ƒIƒ}ƒGƒ‚ƒi[ - 1) ƒoƒ‰‚͐Ԃ¢A - 2) ‚‚܂ç‚È‚¢‚à‚Ì‚ÍŠy‚µ‚¢A - 3) ƒXƒ~ƒŒ‚͐‚¢A - 4) Ž„‚ÍŽÔ‚ð‚à‚Á‚Ä‚¢‚éA - 5) ŽžŒv‚ªŽž‚ð‚°‚éA - 6) »“œ‚͊¢ - 7) ƒIƒ}ƒGƒ‚ƒi[ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ƒŒƒbƒXƒ“ 2.5: ‚â‚è’¼‚µƒRƒ}ƒ“ƒh + ƒŒƒbƒXƒ“ 2.7: ‚â‚è’¼‚µƒRƒ}ƒ“ƒh ** ÅŒã‚̃Rƒ}ƒ“ƒh‚ðŽæ‚èÁ‚·‚É‚Í u ‚ð‰Ÿ‚µ‚Ü‚·BU ‚͍s‘S‘Ì‚ÌŽæÁ‚Å‚·B ** - 1. ˆÈ‰º‚Ì ---> ‚Æ‹L‚³‚ꂽ‚³‚ꂽs‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µAÅ‰‚̊ԈႢ‚ɃJ[ƒ\ƒ‹ - ‚ðˆÚ“®‚µ‚Ü‚µ‚傤B + 1. ˆÈ‰º‚Ì ---> ‚ÆŽ¦‚³‚ꂽs‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µAÅ‰‚̊ԈႢ‚ɃJ[ƒ\ + ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B 2. x ‚ðƒ^ƒCƒv‚µ‚Ä‚¢‚ç‚È‚¢æ“ª‚Ì•¶Žš‚ðíœ‚µ‚Ü‚µ‚傤B 3. ‚³‚ŸAu ‚ðƒ^ƒCƒv‚µ‚čŌã‚ÉŽÀs‚µ‚½ƒRƒ}ƒ“ƒh‚ðŽæ‚èÁ‚µ‚Ü‚µ‚傤B 4. ¡“x‚́Ax ‚ðŽg—p‚µ‚ÄŒë‚è‚ð‘S‚ďC³‚µ‚Ü‚µ‚傤B 5. ‘啶Žš‚Ì U ‚ðƒ^ƒCƒv‚µ‚āAs‚ðŒ³‚Ìó‘Ô‚É–ß‚µ‚Ü‚µ‚傤B 6. u ‚ðƒ^ƒCƒv‚µ‚Ä’¼‘O‚Ì U ƒRƒ}ƒ“ƒh‚ðŽæÁ‚µ‚Ü‚µ‚傤B - 7. ‚ł̓Rƒ}ƒ“ƒh‚ðÄŽÀs‚·‚é‚Ì‚É CTRL-R (CTRL ‚ð‰Ÿ‚µ‚½‚Ü‚Ü R ‚ð‘Å‚Â)‚ð - ”‰ñƒ^ƒCƒv‚µ‚Ä‚Ý‚Ü‚µ‚傤(ŽæÁ‚ÌŽæÁ)B + 7. ‚ł̓Rƒ}ƒ“ƒh‚ðÄŽÀs‚·‚é‚Ì‚É CTRL-R (CTRL ‚ð‰Ÿ‚µ‚½‚Ü‚Ü R ‚ð‘Å‚Â)‚𐔉ñ + ƒ^ƒCƒv‚µ‚Ä‚Ý‚Ü‚µ‚傤(ŽæÁ‚ÌŽæÁ)B ---> ‚±‚̂̍s‚̂̊ԈႢ‚ðC³X‚µAŒã‚Å‚»‚ê‚ç‚̏C³‚ð‚ðŽæÁ‚µ‚Ü‚Ü‚·‚·B - 8. ‚±‚ê‚Í‚Æ‚Ä‚à•Ö—˜‚ȃRƒ}ƒ“ƒh‚Å‚·B‚³‚ŸƒŒƒbƒXƒ“ 2 —v–ñ‚Ɉڂè‚Ü‚µ‚傤B + 8. ‚±‚ê‚Í‚Æ‚Ä‚à•Ö—˜‚ȃRƒ}ƒ“ƒh‚Å‚·B‚³‚ŸƒŒƒbƒXƒ“ 2 —v–ñ‚֐i‚Ý‚Ü‚µ‚傤B @@ -255,24 +348,24 @@ NOTE: 1. ƒJ[ƒ\ƒ‹ˆÊ’u‚©‚ç’PŒê‚Ì––”ö‚Ü‚Å‚ðíœ‚·‚é‚É‚Í dw ‚ƃ^ƒCƒv‚µ‚Ü‚·B - 2. ƒJ[ƒ\ƒ‹ˆÊ’u‚©‚çs‚Ì––”ö‚Ü‚Å‚ðíœ‚·‚é‚É‚Í d$ ‚ƃ^ƒCƒv‚µ‚Ü‚·B - 3. s‘S‘Ì‚ðíœ‚·‚é‚É‚Í dd ‚ƃ^ƒCƒv‚µ‚Ü‚·B - 4. ƒm[ƒ}ƒ‹ƒ‚[ƒh‚ł̃Rƒ}ƒ“ƒhŒ`Ž®‚Í + 4. ƒ‚[ƒVƒ‡ƒ“‚ðŒJ‚è•Ô‚·‚ɂ͐”’l‚ð•t—^‚µ‚Ü‚·: 2w + 5. •ÏX‚É—p‚¢‚éƒRƒ}ƒ“ƒh‚ÌŒ`Ž®‚Í + ƒIƒyƒŒ[ƒ^ [”’l] ƒ‚[ƒVƒ‡ƒ“ - [‰ñ”] ƒRƒ}ƒ“ƒh –Ú“IŒê ‚à‚µ‚­‚Í ƒRƒ}ƒ“ƒh [‰ñ”] –Ú“IŒê ‚»‚ꂼ‚ê: - ‰ñ” - ‚»‚̃Rƒ}ƒ“ƒh‚ð‰½‰ñŒJ‚è•Ô‚·‚©B - ƒRƒ}ƒ“ƒh - íœ d ‚̗ނʼn½‚ð‚·‚é‚©B - –Ú“IŒê - ’PŒê w ‚âs–– $ ‚Ȃǂ̗ނʼn½‚ɑ΂µ‚Ä“­‚«‚©‚¯‚é‚©B + ƒIƒyƒŒ[ƒ^ - íœ d ‚̗ނʼn½‚ð‚·‚é‚©B + ”’l - ‚»‚̃Rƒ}ƒ“ƒh‚ð‰½‰ñŒJ‚è•Ô‚·‚©B + ƒ‚[ƒVƒ‡ƒ“ - w (’PŒê)‚â $ (s––)‚Ȃǂ̗ނŁAƒeƒLƒXƒg‚̉½‚ɑ΂µ‚Ä“­‚«‚© + ‚¯‚é‚©B - 5. ‘O‰ñ‚Ì“®ì‚ðŽæÁ‚·: u (¬•¶Žš u) + 6. s‚̐擪‚Ɉړ®‚·‚é‚ɂ̓[ƒ‚ðŽg—p‚µ‚Ü‚·: 0 + + 7. ‘O‰ñ‚Ì“®ì‚ðŽæÁ‚·: u (¬•¶Žš u) s‘S‘̂̕ύX‚ðŽæÁ‚·: U (‘啶Žš U) ŽæÁ‚µ‚ÌŽæÁ‚µ: CTRL-R - - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ƒŒƒbƒXƒ“ 3.1: “\‚è•t‚¯ƒRƒ}ƒ“ƒh @@ -302,7 +395,7 @@ NOTE: ** ƒJ[ƒ\ƒ‹‚̉º‚Ì•¶Žš‚ð’u‚«Š·‚¦‚é‚É‚Í r ‚ðƒ^ƒCƒv‚µ‚Ü‚· ** - 1. ˆÈ‰º‚Ì ---> ‚Æ‹L‚³‚ꂽ‚³‚ꂽÅ‰‚̍s‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B + 1. ˆÈ‰º‚Ì ---> ‚ÆŽ¦‚³‚ꂽÅ‰‚̍s‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B 2. Å‰‚̊ԈႢ‚̐擪‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B @@ -313,7 +406,7 @@ NOTE: ---> ‚±‚̍‡‚ðl—Í‚µ‚½Žž‚ˁA‚»‚̐l‚ÍŠô‚‚©–âˆá‚Á‚½ƒL[‚ð‰Ÿ‚µ‚à‚µ‚½! ---> ‚±‚̍s‚ð“ü—Í‚µ‚½Žž‚ɁA‚»‚̐l‚ÍŠô‚‚©ŠÔˆá‚Á‚½ƒL[‚ð‰Ÿ‚µ‚Ü‚µ‚½! - 5. ‚³‚ŸAƒŒƒbƒXƒ“ 3.2 ‚Ɉڂè‚Ü‚µ‚傤B + 5. ‚³‚ŸAƒŒƒbƒXƒ“ 3.2 ‚֐i‚Ý‚Ü‚µ‚傤B NOTE: ŽÀÛ‚ÉŽŽ‚µ‚Ü‚µ‚傤BŒˆ‚µ‚ÄŠo‚¦‚邾‚¯‚É‚Í‚µ‚È‚¢‚±‚ƁB @@ -325,7 +418,7 @@ NOTE: ** ’PŒê‚̈ꕔA‚à‚µ‚­‚Í‘S‘Ì‚ð•ÏX‚·‚é‚É‚Í cw ‚ƃ^ƒCƒv‚µ‚Ü‚· ** - 1. ˆÈ‰º‚Ì ---> ‚Æ‹L‚³‚ꂽ‚³‚ꂽÅ‰‚̍s‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B + 1. ˆÈ‰º‚Ì ---> ‚ÆŽ¦‚³‚ꂽÅ‰‚̍s‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B 2. lubw ‚Ì u ‚̈ʒu‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B @@ -348,14 +441,13 @@ cw ** •ÏXƒRƒ}ƒ“ƒh‚́AíœƒRƒ}ƒ“ƒh‚Æ“¯‚¶—l‚ɃIƒuƒWƒFƒNƒg‚ðŽg—p‚µ‚Ü‚· ** - 1. •ÏXƒRƒ}ƒ“ƒh‚́AíœƒRƒ}ƒ“ƒh‚Æ“¯‚¶‚悤‚È“®ì‚ð‚µ‚Ü‚·B‚»‚ÌŒ`Ž®‚Í - [‰ñ”] c –Ú“IŒê ‚à‚µ‚­‚Í c [‰ñ”] –Ú“IŒê + c [”’l] ƒ‚[ƒVƒ‡ƒ“ 2. ƒIƒuƒWƒFƒNƒg‚à“¯‚¶‚ŁAw ‚Í’PŒêA $ ‚͍s––‚È‚Ç‚Æ‚¢‚Á‚½‚à‚Ì‚Å‚·B - 3. ˆÈ‰º‚Ì ---> ‚Æ‹L‚³‚ꂽ‚³‚ꂽs‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B + 3. ˆÈ‰º‚Ì ---> ‚ÆŽ¦‚³‚ꂽs‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B 4. Å‰‚̊ԈႢ‚ÖƒJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B @@ -364,6 +456,7 @@ cw ---> The end of this line needs some help to make it like the second. ---> The end of this line needs to be corrected using the c$ command. +NOTE: ƒ^ƒCƒv’†‚̊ԈႢ‚̓oƒbƒNƒXƒy[ƒXƒL[‚ðŽg‚Á‚Ä’¼‚·‚±‚Æ‚à‚Å‚«‚Ü‚·B ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ƒŒƒbƒXƒ“ 3 —v–ñ @@ -376,40 +469,40 @@ cw 2. ƒJ[ƒ\ƒ‹‚̉º‚Ì•¶Žš‚ð’u‚«Š·‚¦‚é‚ɂ́Ar ‚ðƒ^ƒCƒv‚µ‚½ŒãA‚»‚ê‚ð’u‚«Š·‚¦‚é •¶Žš‚ðƒ^ƒCƒv‚µ‚Ü‚·B - 3. •ÏXƒRƒ}ƒ“ƒh‚ł̓J[ƒ\ƒ‹ˆÊ’u‚©‚ç“Á’è‚Ì–Ú“IŒê‚ÅŽw’肳‚ê‚éI’[‚Ü‚Å‚ð•ÏX - ‚·‚邱‚Æ‚ª‰Â”\‚Å‚·B—Ⴆ‚Î cw ‚È‚ç‚΃J[ƒ\ƒ‹ˆÊ’u‚©‚ç’PŒê‚̏I‚í‚è‚܂ŁA + 3. •ÏXƒRƒ}ƒ“ƒh‚ł̓J[ƒ\ƒ‹ˆÊ’u‚©‚ç“Á’è‚̃‚[ƒVƒ‡ƒ“‚ÅŽw’肳‚ê‚éI’[‚Ü‚Å‚ð•Ï + X‚·‚邱‚Æ‚ª‰Â”\‚Å‚·B—Ⴆ‚Î cw ‚È‚ç‚΃J[ƒ\ƒ‹ˆÊ’u‚©‚ç’PŒê‚̏I‚í‚è‚܂ŁA c$ ‚È‚ç‚΍s‚̏I‚í‚è‚Ü‚Å‚ð•ÏX‚µ‚Ü‚·B 4. •ÏXƒRƒ}ƒ“ƒh‚ÌŒ`Ž®‚Í - [‰ñ”] c –Ú“IŒê ‚à‚µ‚­‚Í c [‰ñ”] –Ú“IŒê + c [”’l] ƒ‚[ƒVƒ‡ƒ“ -‚³‚ŸAŽŸ‚̃ŒƒbƒXƒ“‚Ɉڂè‚Ü‚µ‚傤B +‚³‚ŸAŽŸ‚̃ŒƒbƒXƒ“‚֐i‚Ý‚Ü‚µ‚傤B ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ƒŒƒbƒXƒ“ 4.1: ˆÊ’u‚ƃtƒ@ƒCƒ‹‚̏î•ñ - - ** ƒtƒ@ƒCƒ‹“à‚ł̈ʒu‚ƃtƒ@ƒCƒ‹‚̏ó‘Ô‚ð•\Ž¦‚·‚é‚É‚Í CTRL-g ‚ðƒ^ƒCƒv‚µ‚Ü‚·B - ƒtƒ@ƒCƒ‹“à‚Ì‚ ‚és‚Ɉړ®‚·‚é‚É‚Í SHIFT-G ‚ðƒ^ƒCƒv‚µ‚Ü‚· ** + ** ƒtƒ@ƒCƒ‹“à‚ł̈ʒu‚ƃtƒ@ƒCƒ‹‚̏ó‘Ô‚ð•\Ž¦‚·‚é‚É‚Í CTRL-G ‚ðƒ^ƒCƒv‚µ‚Ü‚·B + ƒtƒ@ƒCƒ‹“à‚Ì‚ ‚és‚Ɉړ®‚·‚é‚É‚Í G ‚ðƒ^ƒCƒv‚µ‚Ü‚· ** NOTE: ƒXƒeƒbƒv‚ðŽÀs‚·‚é‘O‚ɁA‚±‚̃ŒƒbƒXƒ“‘S‚Ä‚É–Ú‚ð’Ê‚µ‚Ü‚µ‚傤!! - 1. CTRL ‚ð‰Ÿ‚µ‚½‚Ü‚Ü g ‚ð‰Ÿ‚µ‚Ü‚µ‚傤Bƒy[ƒW‚̈ê”Ô‰º‚É‚ ‚éƒXƒe[ƒ^ƒXs - ‚Ƀtƒ@ƒCƒ‹–¼‚ƍs‚ª•\Ž¦‚³‚ê‚é‚Í‚¸‚Å‚·B ƒXƒeƒbƒv 3 ‚Ì‚½‚߂ɍs”ԍ†‚ð - Šo‚¦‚Ä‚¨‚«‚Ü‚µ‚傤B(–óŽÒ’:ƒ‹[ƒ‰[‚ª‚ ‚éê‡‚Í‚»‚¿‚ç‚É’–Ú) - - 2. Å‰ºs‚Ɉړ®‚·‚邽‚ß‚É shift-G ‚ƃ^ƒCƒv‚µ‚Ü‚µ‚傤B + 1. CTRL ‚ð‰Ÿ‚µ‚½‚Ü‚Ü g ‚ð‰Ÿ‚µ‚Ü‚µ‚傤B‚±‚Ì‘€ì‚ð CTRL-G ‚ƌĂñ‚Å‚¢‚Ü‚·B + ƒy[ƒW‚̈ê”Ô‰º‚Ƀtƒ@ƒCƒ‹–¼‚ƍs”ԍ†‚ª•\Ž¦‚³‚ê‚é‚Í‚¸‚Å‚·B ƒXƒeƒbƒv 3‚Ì‚½‚ß + ‚ɍs”ԍ†‚ðŠo‚¦‚Ä‚¨‚«‚Ü‚µ‚傤B - 3. æ‚قǂ̍s‚̔ԍ†‚ðƒ^ƒCƒv‚µA shift-G ‚ðƒ^ƒCƒv‚µ‚Ü‚µ‚傤B - Å‰‚É Ctrl-g ‚ð‰Ÿ‚µ‚½s‚É–ß‚Á‚Ä—ˆ‚é‚Í‚¸‚Å‚·B - (”Žš‚ðƒ^ƒCƒv‚µ‚Ä‚¢‚é‚Æ‚«‚ɂ͉æ–Ê‚É•\Ž¦‚³‚ê‚Ü‚¹‚ñ) +NOTE: ‰æ–ʂ̉E‰º‹÷‚ɃJ[ƒ\ƒ‹‚̈ʒu‚ª•\Ž¦‚³‚ê‚Ä‚¢‚é‚©‚à‚µ‚ê‚Ü‚¹‚ñB‚±‚ê‚Í + 'ruler' ƒIƒvƒVƒ‡ƒ“(ƒŒƒbƒXƒ“6‚Åà–¾)‚ðÝ’è‚·‚邱‚Æ‚Å•\Ž¦‚³‚ê‚Ü‚·B - 4. Ž©M‚ªŽ‚Ä‚½‚çƒXƒeƒbƒv 1 ‚©‚ç 3 ‚ðŽÀs‚µ‚Ü‚µ‚傤B + 2. Å‰ºs‚Ɉړ®‚·‚邽‚ß‚É G ‚ðƒ^ƒCƒv‚µ‚Ü‚µ‚傤B + ƒtƒ@ƒCƒ‹‚̐擪‚Ɉړ®‚·‚é‚É‚Í gg ‚ƃ^ƒCƒv‚µ‚Ü‚µ‚傤B + 3. æ‚قǂ̍s‚̔ԍ†‚ðƒ^ƒCƒv‚µ G ‚ðƒ^ƒCƒv‚µ‚Ü‚µ‚傤BÅ‰‚É CTRL-G ‚ð‰Ÿ‚µ‚½s + ‚É–ß‚Á‚Ä—ˆ‚é‚Í‚¸‚Å‚·B + 4. Ž©M‚ªŽ‚Ä‚½‚çƒXƒeƒbƒv 1 ‚©‚ç 3 ‚ðŽÀs‚µ‚Ü‚µ‚傤B ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ƒŒƒbƒXƒ“ 4.2: ŒŸõƒRƒ}ƒ“ƒh @@ -417,22 +510,22 @@ cw ** Œê‹å‚ðŒŸõ‚·‚é‚É‚Í / ‚ƁA‘O•ûŒŸõ‚·‚éŒê‹å‚ðƒ^ƒCƒv‚µ‚Ü‚·B** - 1. ƒm[ƒ}ƒ‹ƒ‚[ƒh‚Å / ‚Æ‚¢‚¤•¶Žš‚ðƒ^ƒCƒv‚µ‚Ü‚·B‰æ–ʈê”Ô‰º‚É : ƒRƒ}ƒ“ƒh - ‚Æ“¯‚¶—l‚É / ‚ªŒ»‚ê‚邱‚Æ‚É‹C‚­‚Å‚µ‚傤B + 1. ƒm[ƒ}ƒ‹ƒ‚[ƒh‚Å / ‚Æ‚¢‚¤•¶Žš‚ðƒ^ƒCƒv‚µ‚Ü‚·B‰æ–ʈê”Ô‰º‚É : ƒRƒ}ƒ“ƒh‚Æ + “¯‚¶—l‚É / ‚ªŒ»‚ê‚邱‚Æ‚É‹C‚­‚Å‚µ‚傤B 2. ‚ł́A'errroor' ‚ƃ^ƒCƒv‚µ‚Ü‚µ‚傤B‚±‚ꂪŒŸõ‚µ‚½‚¢’PŒê‚Å‚·B 3. “¯‚¶Œê‚ð‚à‚¤ˆê“xŒŸõ‚·‚é‚Æ‚«‚Í ’P‚É n ‚ðƒ^ƒCƒv‚µ‚Ü‚·B ‹t•ûŒü‚ÉŒê‹å‚ðŒŸõ‚·‚é‚Æ‚«‚Í N ‚ðƒ^ƒCƒv‚µ‚Ü‚·B - 4. ‹t•ûŒü‚ÉŒê‹å‚ðŒŸõ‚µ‚½‚¢ê‡‚́A/ ƒRƒ}ƒ“ƒh‚Ì‚©‚í‚è‚É ? ƒRƒ}ƒ“ƒh‚ðŽg—p‚µ - ‚Ü‚·B - ----> "errroor" is not the way to spell error; errroor is an error. - -ŒŸõ‚ªƒtƒ@ƒCƒ‹‚̏I‚í‚è‚É’B‚·‚é‚ƁAƒtƒ@ƒCƒ‹‚̐擪‚©‚猟õ‚𑱍s‚µ‚Ü‚·B + 4. ‹t•ûŒü‚ÉŒê‹å‚ðŒŸõ‚·‚éê‡‚́A/ ‚Ì‘ã‚í‚è‚É ? ƒRƒ}ƒ“ƒh‚ðŽg—p‚µ‚Ü‚·B + 5. Œ³‚̏ꏊ‚É–ß‚é‚É‚Í CTRL-O (Ctrl ‚ð‰Ÿ‚µ‘±‚¯‚È‚ª‚ç o •¶Žšƒ^ƒCƒv)‚ðƒ^ƒCƒv‚µ + ‚Ü‚·B‚³‚ç‚É–ß‚é‚É‚Í‚±‚ê‚ðŒJ‚è•Ô‚µ‚Ü‚·BCTRL-I ‚Í‘O•ûŒü‚Å‚·B +Note: "errroor" ‚Í error ‚ƃXƒyƒ‹‚ªˆá‚¢‚Ü‚·; errroor ‚Í‚¢‚í‚ä‚é error ‚Å‚·B +Note: ŒŸõ‚ªƒtƒ@ƒCƒ‹‚̏I‚í‚è‚É’B‚·‚é‚ƁAƒIƒvƒVƒ‡ƒ“ 'wrapscan' ‚ªÝ’肳‚ê‚Ä‚¢‚é + ê‡‚́Aƒtƒ@ƒCƒ‹‚̐擪‚©‚猟õ‚𑱍s‚µ‚Ü‚·B ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ƒŒƒbƒXƒ“ 4.3: ‘Ήž‚·‚銇ŒÊ‚ðŒŸõ @@ -440,8 +533,7 @@ cw ** ‘Ήž‚·‚é ),] ‚â } ‚ðŒŸõ‚·‚é‚É‚Í % ‚ðƒ^ƒCƒv‚µ‚Ü‚· ** - 1. ˆÈ‰º‚Ì ---> ‚Æ‹L‚³‚ꂽ‚³‚ꂽs‚Å (,[ ‚© { ‚Ì‚Ç‚ê‚©‚ɃJ[ƒ\ƒ‹‚ðˆÚ“® - ‚µ‚Ü‚µ‚傤B + 1. ‰º‚Ì ---> ‚ÅŽ¦‚³‚ꂽs‚Å (,[ ‚© { ‚Ì‚Ç‚ê‚©‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B 2. ‚»‚±‚Å % ‚ƃ^ƒCƒv‚µ‚Ü‚µ‚傤B @@ -449,21 +541,22 @@ cw 4. Å‰‚ÌŠ‡ŒÊ‚Ɉړ®‚·‚é‚É‚Í % ‚ƃ^ƒCƒv‚µ‚Ü‚µ‚傤B + 5. ‘¼‚Ì (,),[,],{ or } ‚ŃJ[ƒ\ƒ‹‚ðˆÚ“®‚µA% ‚ª‰½‚ð‚µ‚Ä‚¢‚é‚©Šm”F‚µ‚Ü‚µ‚傤B + ---> This ( is a test line with ('s, ['s ] and {'s } in it. )) + NOTE: ‚±‚Ì‹@”\‚ÍŠ‡ŒÊ‚ªˆê’v‚µ‚Ä‚¢‚È‚¢ƒvƒƒOƒ‰ƒ€‚ðƒfƒoƒbƒO‚·‚é‚Ì‚É‚Æ‚Ä‚à–𗧂¿ ‚Ü‚·B - - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ƒŒƒbƒXƒ“ 4.4: ŠÔˆá‚¢‚ð•ÏX‚·‚é•û–@ ** 'old' ‚ð 'new' ‚É’uŠ·‚·‚é‚É‚Í :s/old/new/g ‚ƃ^ƒCƒv‚µ‚Ü‚· ** - 1. ˆÈ‰º‚Ì ---> ‚Æ‹L‚³‚ꂽ‚³‚ꂽs‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B + 1. ˆÈ‰º‚Ì ---> ‚ÆŽ¦‚³‚ꂽs‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B 2. :s/thee/the ‚ƃ^ƒCƒv‚µ‚Ü‚µ‚傤B‚±‚̃Rƒ}ƒ“ƒh‚Í‚»‚̍s‚ōŏ‰‚ÉŒ© ‚‚©‚Á‚½‚à‚Ì‚É‚¾‚¯s‚È‚í‚ê‚邱‚Æ‚É‹C‚ð‚‚¯‚Ü‚µ‚傤B @@ -474,27 +567,28 @@ NOTE: ---> thee best time to see thee flowers is in thee spring. 4. •¡”s‚©‚猩‚‚©‚镶Žš‚ð•ÏX‚·‚é‚É‚Í - :#,#s/old/new/g #,# ‚Í‚Qs‚̍s”ԍ†‚ðŽw‚µ‚Ü‚·B + :#,#s/old/new/g #,# ‚É‚Í’u‚«Š·‚¦‚é”͈͂̊JŽn‚ƏI—¹‚̍s”ԍ†‚ðŽw’肵‚Ü + ‚·B :%s/old/new/g ƒtƒ@ƒCƒ‹‘S‘Ì‚ÅŒ©‚‚©‚é‚à‚̂ɑ΂µ‚ĕύX‚·‚éB - - - + :%s/old/new/gc ƒtƒ@ƒCƒ‹‘S‘Ì‚ÅŒ©‚‚©‚é‚à‚̂ɑ΂µ‚āA1‚Â1‚Šm”F‚ð‚Æ‚è‚È + ‚ª‚ç•ÏX‚·‚éB ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ƒŒƒbƒXƒ“ 4 —v–ñ - 1. Ctrl-g ‚̓tƒ@ƒCƒ‹‚ł̈ʒu‚ƃtƒ@ƒCƒ‹‚̏ڍׂð•\Ž¦‚µ‚Ü‚·B - Shift-G ‚̓tƒ@ƒCƒ‹‚̍ʼnºs‚Ɉړ®‚µ‚Ü‚·Bs”ԍ†Œã‚É Shift-G ‚Æ‚·‚é‚Æ - ‚»‚̍s‚Ɉړ®‚µ‚Ü‚·B + 1. CTRL-G ‚̓tƒ@ƒCƒ‹‚ł̈ʒu‚ƃtƒ@ƒCƒ‹‚̏ڍׂð•\Ž¦‚µ‚Ü‚·B + G ‚̓tƒ@ƒCƒ‹‚̍ʼnºs‚Ɉړ®‚µ‚Ü‚·B + ”’l G ‚Í‚»‚̍s‚Ɉړ®‚µ‚Ü‚·B + gg ‚͐擪s‚Ɉړ®‚µ‚Ü‚·B 2. / ‚ÌŒã‚ÉŒê‹å‚ðƒ^ƒCƒv‚·‚é‚Æ‘O•û‚ÉŒê‹å‚ðŒŸõ‚µ‚Ü‚·B ? ‚ÌŒã‚ÉŒê‹å‚ðƒ^ƒCƒv‚·‚é‚ÆŒã•û‚ÉŒê‹å‚ðŒŸõ‚µ‚Ü‚·B - ŒŸõ‚ÌŒã n ‚ŁA“¯•ûŒü‚ÉŒŸõ‚ðÄ‚эs‚¢A‚Ü‚½ N ‚Å‹t•ûŒü‚ÉŒŸõ‚ðs‚È‚¢‚Ü - ‚·B + ŒŸõ‚ÌŒã‚Ì n ‚Í“¯‚¶•ûŒü‚ÌŽŸ‚ÌŒŸõ‚ðAN ‚Í‹t•ûŒü‚ÌŒŸõ‚ð‚µ‚Ü‚·B + CTRL-O ‚͏ꏊ‚ð‘O‚ɈڂµACTRL-I ‚͏ꏊ‚ðŽŸ‚ÉˆÚ“®‚µ‚Ü‚·B - 3. (,),[,],{, or } ã‚ɃJ[ƒ\ƒ‹‚ª‚ ‚éó‘Ô‚Å % ‚ðƒ^ƒCƒv‚·‚é‚Æ - ‘Ήž‚µ‚½‘΂Ɉړ®‚µ‚Ü‚·B + 3. (,),[,],{, ‚à‚µ‚­‚Í } ã‚ɃJ[ƒ\ƒ‹‚ª‚ ‚éó‘Ô‚Å % ‚ðƒ^ƒCƒv‚·‚é‚Ƒ΂ɂȂ镶 + Žš‚ÖˆÚ“®‚µ‚Ü‚·B 4. Œ»Ýs‚̍ŏ‰‚Ì old ‚ð new ‚É’uŠ·‚·‚éB :s/old/new Œ»Ýs‚Ì‘S‚Ä‚Ì old ‚ð new ‚É’uŠ·‚·‚éB :s/old/new/g @@ -502,7 +596,6 @@ NOTE: ƒtƒ@ƒCƒ‹‚Ì’†‚Ì‘S‚Ä‚ÌŒŸõŒê‹å‚ð’uŠ·‚·‚éB :%s/old/new/g 'c' ‚ð‰Á‚¦‚é‚Æ’uŠ·‚Ì“x‚ÉŠm”F‚ð‹‚ß‚éB :%s/old/new/gc - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ƒŒƒbƒXƒ“ 5.1: ŠO•”ƒRƒ}ƒ“ƒh‚ðŽÀs‚·‚é•û–@ @@ -519,11 +612,11 @@ NOTE: ƒVƒFƒ‹ƒvƒƒ“ƒvƒg‚̂悤‚ɃfƒBƒŒƒNƒgƒŠ‚̈ꗗ‚ª•\Ž¦‚³‚ê‚é‚Í‚¸‚Å‚·B ‚à‚µ‚­‚Í ls ‚ª“®‚©‚È‚¢‚È‚ç‚Î :!dir ‚ðŽg—p‚µ‚Ü‚µ‚傤B ----> NOTE: ‚±‚Ì•û–@‚É‚æ‚Á‚Ä‚ ‚ç‚ä‚éƒRƒ}ƒ“ƒh‚ªŽÀs‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚·B - ----> NOTE: ‘S‚Ä‚Ì : ƒRƒ}ƒ“ƒh‚Í ‚ð‰Ÿ‚µ‚ďI—¹‚µ‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñB - +Note: ‚±‚Ì•û–@‚É‚æ‚Á‚Ä‚ ‚ç‚ä‚éƒRƒ}ƒ“ƒh‚ªŽÀs‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚·B‚à‚¿‚ë‚ñˆø” + ‚à—^‚¦‚ç‚ê‚Ü‚·B +Note: ‘S‚Ä‚Ì : ƒRƒ}ƒ“ƒh‚Í ‚ð‰Ÿ‚µ‚ďI—¹‚µ‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñB + ˆÈ~‚Å‚Í‚±‚Ì‚±‚Æ‚ÉŒ¾‹y‚µ‚Ü‚¹‚ñB ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -540,37 +633,38 @@ NOTE: 3. ‚Å‚Í :w TEST ‚ƃ^ƒCƒv‚µ‚Ü‚µ‚傤 (TEST ‚́A‘I‚ñ‚¾ƒtƒ@ƒCƒ‹–¼‚Å‚·)B 4. ‚±‚ê‚É‚æ‚èƒtƒ@ƒCƒ‹‘S‘Ì‚ª TEST ‚Æ‚¢‚¤–¼‘O‚Å•Û‘¶‚³‚ê‚Ü‚·B - ‚à‚¤ˆê“x :!dir ‚ƃ^ƒCƒv‚µ‚ÄŠm”F‚µ‚Ä‚Ý‚Ü‚µ‚傤B + ‚à‚¤ˆê“x :!dir ‚à‚µ‚­‚Í !ls ‚ƃ^ƒCƒv‚µ‚ÄŠm”F‚µ‚Ä‚Ý‚Ü‚µ‚傤B ----> ‚±‚±‚Å Vim ‚ðI—¹‚µAƒtƒ@ƒCƒ‹–¼ TEST ‚Æ‹¤‚É‹N“®‚·‚é‚ƁA•Û‘¶‚µ‚½Žž‚Ì +Note: ‚±‚±‚Å Vim ‚ðI—¹‚µAƒtƒ@ƒCƒ‹–¼ TEST ‚Æ‹¤‚É‹N“®‚·‚é‚ƁA•Û‘¶‚µ‚½Žž‚Ì ƒ`ƒ…[ƒgƒŠƒAƒ‹‚Ì•¡»‚ª‚Å‚«ã‚ª‚é‚Í‚¸‚Å‚·B - 5. ‚ł́A :!del TEST ‚ƃ^ƒCƒv‚µ‚ătƒ@ƒCƒ‹‚ðíœ‚µ‚Ä‚Ý‚Ü‚µ‚傤B - + 5. ‚³‚ç‚ɁAŽŸ‚̂悤‚Ƀ^ƒCƒv‚µ‚ătƒ@ƒCƒ‹‚ðÁ‚µ‚Ü‚µ‚傤(MS-DOS): :!del TEST + ‚à‚µ‚­‚Í(Unix): :!rm TEST ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ƒŒƒbƒXƒ“ 5.3: ‘I‘ð‚µ‚½‘‚«ž‚Ý - ** •”•ª“I‚É•Û‘¶‚·‚é‚É‚Í :#,# w ƒtƒ@ƒCƒ‹–¼ ‚ƃ^ƒCƒv‚µ‚Ü‚· ** +** ƒtƒ@ƒCƒ‹‚̈ʒu‚ð•Û‘¶‚·‚é‚ɂ́Av ƒ‚[ƒVƒ‡ƒ“‚Æ :w FILENAME ‚ðƒ^ƒCƒv‚µ‚Ü‚·B ** - 1. ‚à‚¤ˆê“xƒfƒBƒŒƒNƒgƒŠ‚̈ꗗ‚ðŽæ“¾‚·‚邽‚ß‚É :!ls ‚ƃ^ƒCƒv‚µATEST ‚Ì—l‚É - ƒtƒ@ƒCƒ‹‚ðˆê‚‘I‚ñ‚Å‚Ý‚Ü‚µ‚傤B + 1. ‚±‚̍s‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚·B - 2. ‚±‚̃y[ƒW‚ÌŽn‚߂܂ŃJ[ƒ\ƒ‹‚ðˆÚ“®‚µAƒtƒ@ƒCƒ‹‚̍s”‚ð’m‚邽‚ß‚É Ctrl-g ‚Æ - ƒ^ƒCƒv‚µ‚Ü‚µ‚傤B‚»‚̍s”ԍ†‚ð‰¯‚¦‚Ä‚¨‚«‚Ü‚µ‚傤B + 2. v ‚ð‰Ÿ‚µAˆÈ‰º‚Ì‘æ5€–ڂɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚·BƒeƒLƒXƒg‚ª‹­’²•\Ž¦‚³‚ê‚é‚Ì + ‚É’–Ú‚µ‚ĉº‚³‚¢B - 3. ‚»‚µ‚ăy[ƒW‚̏I‚è‚܂ňړ®‚µAÄ“x Ctrl-g ‚ðs‚¢‚Ü‚·B - ‚±‚̍s”ԍ†‚à‰¯‚¦‚Ä‚¨‚«‚Ü‚µ‚傤B + 3. •¶Žš : ‚ð‰Ÿ‚·‚ƁA‰æ–ʂ̍ʼnº•”‚É :'<,'> ‚ªŒ»‚ê‚Ü‚·B - 4. ‚ ‚é•”•ª‚¾‚¯‚ð TEST ‚Æ‚¢‚¤–¼‚Å•Û‘¶‚·‚邽‚߂ɁA:#,# w TEST ‚ƃ^ƒCƒv‚µ‚Ü‚·B - ‚±‚Ì #,# ‚ÍŠo‚¦‚Ä‚¨‚¢‚½‚Q‚‚̔ԍ†(ã’[,‰º’[) ‚Å‚ ‚èA TEST ‚ªƒtƒ@ƒCƒ‹–¼ - ‚Æ‚È‚è‚Ü‚·B + 4. w TEST (TESET ‚Í‘¶Ý‚µ‚È‚¢ƒtƒ@ƒCƒ‹–¼)‚ðƒ^ƒCƒv‚µ‚Ü‚·B + Enter ‚ð‰Ÿ‚·‘O‚É :'<,'>w TEST ‚Æ‚È‚Á‚Ä‚¢‚邱‚Æ‚ðŠm”F‚µ‚ĉº‚³‚¢B - 5. Ä“xAƒtƒ@ƒCƒ‹‚ª‘¶Ý‚·‚邱‚Æ‚ðŠm”F‚·‚邽‚ß‚É :!dir ‚ƃ^ƒCƒv‚µ‚Ü‚µ‚傤B - ‚½‚¾‚µ‚±‚̃tƒ@ƒCƒ‹‚͏Á‚µ‚Ä‚Í‚¢‚¯‚Ü‚¹‚ñB + 5. Vim ‚Í TEST ‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹‚É‘I‘ð‚³‚ê‚½s‚ð‘‚«ž‚Þ‚Å‚µ‚傤B + !dir ‚à‚µ‚­‚Í !ls ‚Å‚»‚ê‚ðŠm”F‚µ‚Ü‚·B + ‚»‚ê‚͍폜‚µ‚È‚¢‚Å‚¨‚¢‚ĉº‚³‚¢BŽŸ‚̃ŒƒbƒXƒ“‚ÅŽg—p‚µ‚Ü‚·B +NOTE: v ‚ð‰Ÿ‚·‚ƁAVisual ‘I‘ð‚ªŽn‚Ü‚è‚Ü‚·BƒJ[ƒ\ƒ‹‚ð“®‚©‚·‚±‚ƂŁA‘I‘ð”͈͂ð + ‘å‚«‚­‚à¬‚³‚­‚à‚Å‚«‚Ü‚·B‚³‚ç‚ɁA‚»‚Ì‘I‘ð”͈͂ɑ΂µ‚ăIƒyƒŒ[ƒ^‚ð“K—p + ‚«‚Ü‚·B—Ⴆ‚Î d ‚̓eƒLƒXƒg‚ðíœ‚µ‚Ü‚·B ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ƒŒƒbƒXƒ“ 5.4: ƒtƒ@ƒCƒ‹‚̎捞‚ƍ‡•¹ @@ -578,21 +672,21 @@ NOTE: ** ƒtƒ@ƒCƒ‹‚Ì’†g‚ð‘}“ü‚·‚é‚É‚Í :r ƒtƒ@ƒCƒ‹–¼ ‚ƃ^ƒCƒv‚µ‚Ü‚· ** - 1. æ‚Ù‚Ç‚Ì TEST ‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹‚ª‘¶Ý‚·‚邱‚Æ‚ðŠm‚©‚߂邽‚ß‚É :!dir ‚Æ - ƒ^ƒCƒv‚µ‚Ü‚µ‚傤B + 1. ƒJ[ƒ\ƒ‹‚ðˆÈ‰º‚̍s‚ɍ‡‚킹‚Ü‚·B - 2. ƒJ[ƒ\ƒ‹‚ð‚±‚Ìƒy[ƒW‚̐擪‚Ɉړ®‚µ‚Ü‚·B +NOTE: ƒXƒeƒbƒv 2 ‚ÌŽÀsŒãAƒŒƒbƒXƒ“ 5.3 ‚̃eƒLƒXƒg‚ªŒ»‚ê‚Ü‚·B‰º‚ɉº‚ª‚Á‚Ä‚± + ‚̃ŒƒbƒXƒ“‚Ɉړ®‚µ‚Ü‚µ‚傤B -NOTE: ƒXƒeƒbƒv 3 ‚ðŽÀs‚·‚é‚ƁA‰æ–Ê‚É ƒŒƒbƒXƒ“ 5.3 ‚ªŒ»‚í‚ê‚é‚̂ŁAƒJ[ƒ\ƒ‹‚ð - ‰º‚Ɉړ®‚µ‚±‚̃ŒƒbƒXƒ“‚Ü‚Å–ß‚è‚Ü‚µ‚傤B + 2. ‚Å‚Í TEST ‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹‚ð :r TEST ‚Æ‚¢‚¤ƒRƒ}ƒ“ƒh‚œǂݍž‚Ý‚Ü‚µ‚傤B + ‚±‚±‚Å‚¢‚¤ TEST ‚ÍŽg‚¤ƒtƒ@ƒCƒ‹‚Ì–¼‘O‚Ì‚±‚Æ‚Å‚·B + “ǂݍž‚܂ꂽƒtƒ@ƒCƒ‹‚́AƒJ[ƒ\ƒ‹s‚̉º‚É‚ ‚è‚Ü‚·B - 3. ‚ł́A:r TEST ‚ƃ^ƒCƒv‚µ‚Ä TEST ƒtƒ@ƒCƒ‹‚ðŽæž‚Ý‚Ü‚µ‚傤B‚±‚Ì TEST ‚Í - ƒtƒ@ƒCƒ‹–¼‚Å‚·B + 3. Žæž‚ñ‚¾ƒtƒ@ƒCƒ‹‚ðŠm”F‚µ‚Ä‚Ý‚Ü‚µ‚傤BƒJ[ƒ\ƒ‹‚ð–ß‚·‚ƁAƒŒƒbƒXƒ“5.3 ‚Ì + ƒIƒŠƒWƒiƒ‹‚ƃtƒ@ƒCƒ‹‚É‚æ‚é‚à‚Ì‚Ì2‚‚ª‚ ‚邱‚Æ‚ª‚í‚©‚è‚Ü‚·B -NOTE: ƒtƒ@ƒCƒ‹‚̎捞‚݂̓J[ƒ\ƒ‹‚̈ʒu‚©‚çs‚í‚ê‚Ü‚·B +NOTE: ŠO•”ƒRƒ}ƒ“ƒh‚̏o—Í‚ð“ǂݍž‚Þ‚±‚Æ‚ào—ˆ‚Ü‚·B—Ⴆ‚΁A + :r !ls ‚Í ls ƒRƒ}ƒ“ƒh‚̏o—Í‚ðƒJ[ƒ\ƒ‹ˆÈ‰º‚ɓǂݍž‚Ý‚Ü‚·B - 4. Žæž‚ñ‚¾ƒtƒ@ƒCƒ‹‚ðŠm”F‚µ‚Ä‚Ý‚Ü‚µ‚傤BƒJ[ƒ\ƒ‹‚ð–ß‚·‚ƁAƒŒƒbƒXƒ“5.3 ‚Ì - ƒIƒŠƒWƒiƒ‹‚ƃtƒ@ƒCƒ‹‚É‚æ‚é‚à‚Ì‚Ì2‚‚ª‚ ‚邱‚Æ‚ª‚í‚©‚è‚Ü‚·B ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -602,19 +696,19 @@ NOTE: 1. :!command ‚É‚æ‚Á‚Ä ŠO•”ƒRƒ}ƒ“ƒh‚ðŽÀs‚µ‚Ü‚·B ‚æ‚­Žg‚¤—á: - :!ls - ƒfƒBƒŒƒNƒgƒŠ‚̃tƒ@ƒCƒ‹ˆê——‚ðŒ©‚éB - :!del ƒtƒ@ƒCƒ‹–¼ - ƒtƒ@ƒCƒ‹–¼‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹‚̍폜‚·‚éB + (MS-DOS) (Unix) + :!dir :!ls - ƒfƒBƒŒƒNƒgƒŠ“à‚̈ꗗ‚ðŒ©‚éB + :!del FILENAME :!rm FILENAME - ƒtƒ@ƒCƒ‹‚ðíœ‚·‚éB 2. :w ƒtƒ@ƒCƒ‹–¼ ‚É‚æ‚Á‚ătƒ@ƒCƒ‹–¼‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹‚ªƒfƒBƒXƒN‚ɏ‘‚«ž‚Ü‚ê‚éB - 3. :#,# w ƒtƒ@ƒCƒ‹–¼ ‚É‚æ‚Á‚Ä # ‚©‚ç # ‚Ü‚Å‚ð•Û‘¶‚·‚éB + 3. v ƒ‚[ƒVƒ‡ƒ“‚Å :w FILENAME ‚Æ‚·‚é‚ƁAƒrƒWƒ…ƒAƒ‹‘I‘ðs‚ªƒtƒ@ƒCƒ‹‚É•Û‘¶‚³ + ‚ê‚éB 4. :r ƒtƒ@ƒCƒ‹–¼ ‚É‚æ‚èƒtƒ@ƒCƒ‹–¼‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹‚ªƒfƒBƒXƒN‚æ‚èŽæž‚Ü‚êA ƒJ[ƒ\ƒ‹ˆÊ’u‚̉º‚É‘}“ü‚³‚ê‚éB - - - + 5. :r !dir ‚Í dir ƒRƒ}ƒ“ƒh‚̏o—Í‚ðƒJ[ƒ\ƒ‹ˆÊ’uˆÈ‰º‚ɓǂݍž‚ށB @@ -624,18 +718,18 @@ NOTE: ** o ‚ðƒ^ƒCƒv‚·‚é‚ƁAƒJ[ƒ\ƒ‹‚̉º‚̍s‚ªŠJ‚«A‘}“üƒ‚[ƒh‚É“ü‚è‚Ü‚· ** - 1. ˆÈ‰º‚Ì ---> ‚Æ‹L‚³‚ꂽ‚³‚ꂽs‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B + 1. ˆÈ‰º‚Ì ---> ‚ÆŽ¦‚³‚ꂽs‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B 2. o (¬•¶Žš) ‚ðƒ^ƒCƒv‚µ‚āAƒJ[ƒ\ƒ‹‚̉º‚̍s‚ðŠJ‚«A‘}“üƒ‚[ƒh‚É“ü‚è‚Ü‚·B - 3. ---> ‚Æ‹L‚³‚ꂽs‚ðŽÊ‚µA ‚ƃ^ƒCƒv‚µ‚ĒljÁƒ‚[ƒh‚ðI—¹‚µ‚Ü‚µ‚傤B + 3. ‚³‚ç‚É‘}“üƒ‚[ƒh‚ðI—¹‚·‚éˆ×‚É ‚ðƒ^ƒCƒv‚µ‚Ü‚·B ---> o ‚ðƒ^ƒCƒv‚·‚é‚ƃJ[ƒ\ƒ‹‚ÍŠJ‚¢‚½s‚ÖˆÚ“®‚µ‘}“üƒ‚[ƒh‚É“ü‚è‚Ü‚·B 4. ƒJ[ƒ\ƒ‹‚̏ã‚̍s‚É‘}“ü‚·‚é‚ɂ́A¬•¶Žš‚Ì o ‚Å‚Í‚È‚­A’Pƒ‚ɑ啶Žš‚Ì O ‚ðƒ^ƒCƒv‚µ‚Ü‚·BŽŸ‚̍s‚ÅŽŽ‚µ‚Ä‚Ý‚Ü‚µ‚傤B -‚±‚̍s‚̏ã‚Ö‘}“ü‚·‚é‚ɂ́A‚±‚̍s‚ÖƒJ[ƒ\ƒ‹‚ð’u‚¢‚Ä Shift-O ‚ðƒ^ƒCƒv‚µ‚Ü‚·B +---> ‚±‚̍s‚̏ã‚Ö‘}“ü‚·‚é‚ɂ́A‚±‚̍s‚ÖƒJ[ƒ\ƒ‹‚ð’u‚¢‚Ä O ‚ðƒ^ƒCƒv‚µ‚Ü‚·B @@ -647,94 +741,118 @@ NOTE: ** ƒJ[ƒ\ƒ‹‚ÌŽŸ‚̈ʒu‚©‚çƒeƒLƒXƒg‚ð’ljÁ‚·‚é‚É‚Í a ‚ƃ^ƒCƒv‚µ‚Ü‚· ** - 1. ƒm[ƒ}ƒ‹ƒ‚[ƒh‚É‚µ‚Ĉȉº‚Ì ---> ‚Æ‹L‚³‚ꂽ‚³‚ꂽÅ‰‚̍s‚Å $ ‚ðƒ^ƒCƒv‚µ - ‚āAI’[‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B + 1. ƒJ[ƒ\ƒ‹‚ð ---> ‚ÅŽ¦‚³‚ꂽ‹Æ‚ÖˆÚ“®‚µ‚Ü‚µ‚傤B - 2. ƒJ[ƒ\ƒ‹‚Ì•¶Žš‚ÌŒã‚ë‚ɃeƒLƒXƒg‚ð’ljÁ‚·‚邽‚ß‚É a (¬•¶Žš) ‚ðƒ^ƒCƒv‚µ‚Ü - ‚·B + 2. e ‚ð‰Ÿ‚µ‚Ä li ‚̏I’[•”‚܂ŃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚·B -NOTE: ‚±‚ê‚͍Ōã‚Ì•¶Žš‚ɂăeƒLƒXƒg‚ð‘}“ü‚µA ‚ðƒ^ƒCƒv‚µ‚ăJ[ƒ\ƒ‹‚ð‰E‚É - ˆÚ“®‚µAÅŒã‚É x ƒ^ƒCƒv‚µ‚čs––‚ɒljÁ‚·‚é‚Æ‚¢‚Á‚½‚悤‚È i ‚̃^ƒCƒv‚ð - ”ð‚¯‚é‚±‚Æ‚ª‚«‚Ü‚·B + 3. ƒJ[ƒ\ƒ‹‚ÌŒã‚ë‚ɃeƒLƒXƒg‚ð’ljÁ‚·‚邽‚ß‚É a (¬•¶Žš) ‚ðƒ^ƒCƒv‚µ‚Ü‚·B - 3. ‚³‚čŏ‰‚̍s‚ðŠ®¬‚µ‚Ü‚µ‚傤BƒeƒLƒXƒg‚ª‘}“ü‚³‚ê‚éˆÊ’u‚ðœ‚¯‚΁A - ’ljÁƒRƒ}ƒ“ƒh‚Í‘}“üƒ‚[ƒh‚Æ‚Ü‚Á‚½‚­“¯‚¶‚Å‚·B + 4. ‚»‚̉º‚̍s‚̂̂悤‚È’PŒê‚ÉŠ®¬‚³‚¹‚Ü‚·B‘}“üƒ‚[ƒh‚𔲂¯‚éˆ×‚É ‚ɉŸ + ‚µ‚Ü‚·B ----> ‚±‚̍s‚ŁAs––‚É•¶Í‚ð’ljÁ‚·‚é ----> ‚±‚̍s‚ŁAs––‚É•¶Í‚ð’ljÁ‚·‚é—ûK‚ð‚·‚é‚±‚Æ‚ª‚Å‚«‚é‚Å‚µ‚傤B + 5. e ‚ðŽg‚Á‚ÄŽŸ‚Ì•sŠ®‘S‚È’PŒê‚ÖˆÚ“®‚µAƒXƒeƒbƒv 3 ‚Æ 4 ‚ðŒJ‚è•Ô‚µ‚Ü‚·B + +---> This li will allow you to pract appendi text to a line. +---> This line will allow you to practice appending text to a line. +Note: a, i ‚Æ A ‚Í“¯‚¶‘}“üƒ‚[ƒh‚ÖˆÚ‚è‚Ü‚·‚ªA•¶Žš‚ª‘}“ü‚³‚ê‚éˆÊ’u‚¾‚¯‚ªˆÙ‚È‚è + ‚Ü‚·B ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ƒŒƒbƒXƒ“ 6.3: ‚»‚Ì‘¼‚Ì’uŠ· + ƒŒƒbƒXƒ“ 6.3: ‚»‚Ì‘¼‚Ì’uŠ·•û–@ ** 1•¶ŽšˆÈã‚ð’u‚«Š·‚¦‚é‚ɂ͑啶Žš‚Ì R ‚ƃ^ƒCƒv‚µ‚Ü‚µ‚傤 ** - 1. ˆÈ‰º‚Ì ---> ‚Æ‹L‚³‚ꂽ‚³‚ꂽs‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B - - 2. ---> ‚Æ‹L‚³‚ꂽ‚Qs–ڂƈႤAÅ‰‚Ì’PŒê‚̐擪‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤B - (’PŒê 'last') + 1. ˆÈ‰º‚Ì ---> ‚ÆŽ¦‚³‚ꂽ‹Æ‚ɃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚·BÅ‰‚Ì xxx ‚̐擪‚Ɉړ®‚µ + ‚Ü‚·B - 3. ‚±‚±‚Å R ‚ðƒ^ƒCƒv‚µ‚āAÅ‰‚̍s‚ÆŽŸ‚̍s‚ª“¯‚¶‚É‚È‚é‚悤‚ÉŠù‘¶‚̃eƒLƒXƒg - ‚֏㏑‚«ƒ^ƒCƒv‚µA‚Ps–Ú‚ÌŽc‚è‚Ì•”•ª‚ð‘‚«Š·‚¦‚Ü‚µ‚傤B + 2. R ‚ð‰Ÿ‚µ‚āA2s–ڂ̐”’l‚ðƒ^ƒCƒv‚·‚邱‚ƂŁAxxx ‚ª’uŠ·‚³‚ê‚Ü‚·B ----> To make the first line the same as the last on this page use the keys. ----> To make the first line the same as the second, type R and the new text. + 3. ’uŠ·ƒ‚[ƒh‚𔲂¯‚é‚É‚Í ‚ð‰Ÿ‚µ‚Ü‚·Bs‚ÌŽc‚肪•ÏX‚³‚ê‚Ä‚¢‚È‚¢‚Ü‚Ü‚É + ‚Ȃ邱‚Æ‚É’ˆÓ‚µ‚Ä‚­‚¾‚³‚¢B - 4. ƒ‚[ƒh‚𔲂¯‚邽‚ß‚É ‚ðƒ^ƒCƒv‚·‚é‚ƁA•ÏX‚µ‚Ä‚¢‚È‚¢•”•ª‚ªŽc‚邱‚Æ - ‚É’ˆÓ‚µ‚Ü‚µ‚傤B + 5. Žc‚Á‚½ xxx ‚ðƒXƒeƒbƒv‚ðŒJ‚è•Ô‚µ‚Ä’uŠ·‚µ‚Ü‚µ‚傤B +---> Adding 123 to xxx gives you xxx. +---> Adding 123 to 456 gives you 579. +NOTE: ’uŠ·ƒ‚[ƒh‚Í‘}“üƒ‚[ƒh‚ÉŽ—‚Ä‚¢‚Ü‚·‚ªA‘S‚Ẵ^ƒCƒv‚³‚ꂽ•¶Žš‚ÍŠù‘¶‚Ì•¶Žš + ‚ðíœ‚µ‚Ü‚·B ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ƒŒƒbƒXƒ“ 6.4: ƒIƒvƒVƒ‡ƒ“‚̐ݒè + ƒŒƒbƒXƒ“ 6.4: ƒeƒLƒXƒg‚̃Rƒs[‚ƃy[ƒXƒg + + ** ƒeƒLƒXƒg‚̃Rƒs[‚ɂ̓IƒyƒŒ[ƒ^ y ‚ðAƒy[ƒXƒg‚É‚Í p ‚ðŽg‚¢‚Ü‚· ** - ** ŒŸõ‚â’uŠ·‚̍ۂɑ啶Žš‚Ə¬•¶Žš‚𖳎‹‚·‚é—l‚ɃIƒvƒVƒ‡ƒ“‚ðÝ’肵‚Ü‚· ** + 1. ---> ‚ÆŽ¦‚³‚ꂽs‚ÖˆÚ“®‚µAƒJ[ƒ\ƒ‹‚ð "a)" ‚ÌŒã‚É’u‚¢‚Ä‚¨‚«‚Ü‚·B + + 2. v ‚ŃrƒWƒ…ƒAƒ‹ƒ‚[ƒh‚ðŠJŽn‚µA"first"‚ÌŽè‘O‚܂ŃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚·B + + 3. y ‚ðƒ^ƒCƒv‚µ‚Ä‹­’²•\Ž¦‚³‚ꂽƒeƒLƒXƒg‚ð yank (ƒRƒs[)‚µ‚Ü‚·B + 4. ŽŸ‚̍s‚̍s––‚܂ŃJ[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚·: j$ - 1. ˆÈ‰º‚Ì—l‚Ƀ^ƒCƒv‚µ‚Ä 'ignore' ‚ðŒŸõ‚µ‚Ü‚µ‚傤: - /ignore + 5. p ‚ð‰Ÿ‚µ‚Ä“\‚è•t‚¯(put)‚Ä‚©‚çAŽŸ‚ðƒ^ƒCƒv‚µ‚Ü‚·: a second + + 6. ƒrƒWƒ…ƒAƒ‹ƒ‚[ƒh‚Å " item." ‚ð‘I‘ð‚µAy ‚Ń„ƒ“ƒNAŽŸ‚̍s‚̍s––‚Ü‚Å j$ ‚Å + ˆÚ“®‚µA p ‚ŃeƒLƒXƒg‚ð‚»‚±‚É put ‚µ‚Ü‚·B + +---> a) this is the first item. + b) + + Note: ’PŒê‚ð1‚ yank ‚·‚é‚Ì‚É y ‚ðƒIƒyƒŒ[ƒ^‚Æ‚µ‚Ä yw ‚Æ‚·‚邱‚Æ‚ào—ˆ‚Ü‚·B +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ƒŒƒbƒXƒ“ 6.5: ƒIƒvƒVƒ‡ƒ“‚̐ݒè + + + ** ŒŸõ‚â’uŠ·‚̍ۂɑ啶Žš/¬•¶Žš‚𖳎‹‚·‚é‚ɂ́AƒIƒvƒVƒ‡ƒ“‚ðÝ’肵‚Ü‚· ** + + 1. ŽŸ‚Ì—l‚É“ü—Í‚µ‚Ä 'ignore' ‚ðŒŸõ‚µ‚Ü‚µ‚傤: /ignore n ‚ð‰Ÿ‚µ‚ĉ½“x‚©ŒŸõ‚ðŒJ‚è•Ô‚µ‚Ü‚·B - 2. ˆÈ‰º‚Ì—l‚Ƀ^ƒCƒv‚µ‚Ä 'ic' (Ignore Case ‚Ì—ª‚Å‚·) ƒIƒvƒVƒ‡ƒ“‚ðÝ’肵‚Ü‚·B - :set ic + 2. ŽŸ‚Ì—l‚É“ü—Í‚µ‚Ä 'ic' (Ignore Case ‚Ì—ª) ƒIƒvƒVƒ‡ƒ“‚ðÝ’肵‚Ü‚·: :set ic 3. ‚Å‚Í n ‚É‚æ‚Á‚Ä‚à‚¤1“x 'ignore' ‚ðŒŸõ‚µ‚Ü‚·B n ‚ð‰Ÿ‚µ‚Ä‚³‚ç‚ɐ”‰ñŒŸõ‚ðŒJ‚è•Ô‚µ‚Ü‚µ‚傤B - 4. 'hlsearch' ‚Æ 'incsearch' ƒIƒvƒVƒ‡ƒ“‚ðˆÈ‰º‚Ì—l‚ɐݒ肵‚Ü‚µ‚傤B - :set hls is + 4. 'hlsearch' ‚Æ 'incsearch' ƒIƒvƒVƒ‡ƒ“‚ðÝ’肵‚Ü‚µ‚傤: :set hls is + + 5. ŒŸõƒRƒ}ƒ“ƒh‚ðÄ“ü—Í‚µ‚āA‰½‚ª‹N‚±‚é‚©Œ©‚Ä‚Ý‚Ü‚µ‚傤: /ignore - 5. ‚à‚¤ˆê“xŒŸõƒRƒ}ƒ“ƒh‚ð“ü—Í‚µ‚āA‰½‚ª‹N‚±‚é‚©Œ©‚Ä‚Ý‚Ü‚µ‚傤: - /ignore + 6. ‘啶Žš¬•¶Žš‚Ì‹æ•Ê‚𖳌ø‚É‚·‚é‚É‚ÍŽŸ‚Ì—l‚É“ü—Í‚µ‚Ü‚·: :set noic +Note: ƒ}ƒbƒ`‚Ì‹­’²•\Ž¦‚ð‚â‚ß‚é‚É‚ÍŽŸ‚Ì—l‚É“ü—Í‚µ‚Ü‚·: :nohlsearch +Note: 1‚‚̌ŸõƒRƒ}ƒ“ƒh‚¾‚¯‘啶Žš¬•¶Žš‚Ì‹æ•Ê‚ð‚â‚ß‚½‚¢‚È‚ç‚΁AƒtƒŒ[ƒY‚É \c + ‚ðŽg—p‚µ‚Ü‚·: /ignore\c ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ƒŒƒbƒXƒ“ 6 —v–ñ - 1. o ‚ðƒ^ƒCƒv‚·‚é‚ƃJ[ƒ\ƒ‹‚̉º‚̍s‚ðŠJ‚¯‚āA‚»‚±‚Å‘}“üƒ‚[ƒh‚É‚È‚éB O (‘啶Žš) ‚ðƒ^ƒCƒv‚·‚é‚ƃJ[ƒ\ƒ‹‚̏ã‚̍s‚Å‘}“üƒ‚[ƒh‚É‚È‚éB 2. ƒJ[ƒ\ƒ‹ã‚Ì•¶Žš‚ÌŽŸ‚©‚çƒeƒLƒXƒg‚ð’ljÁ‚·‚é‚É‚Í a ‚ƃ^ƒCƒv‚·‚éB s––‚ÉŽ©“®‚ŃeƒLƒXƒg‚ð‘}“ü‚·‚é‚ɂ͑啶Žš A ‚ðƒ^ƒCƒv‚·‚éB - 3. ‘啶Žš‚Ì R ‚ðƒ^ƒCƒv‚·‚é‚Æ’uŠ·ƒ‚[ƒh‚É“ü‚èA‚ð‰Ÿ‚·‚Æ”²‚¯‚éB - - 4. ":set xxx" ‚ƃ^ƒCƒv‚·‚é‚ƃIƒvƒVƒ‡ƒ“ "xxx" ‚ªÝ’肳‚ê‚éB - - - - - + 3. e ƒRƒ}ƒ“ƒh‚Í’PŒê‚̏I’[•”ƒJ[ƒ\ƒ‹‚ðˆÚ“®‚·‚éB + 4. y ƒIƒyƒŒ[ƒ^‚̓eƒLƒXƒg‚ð yank (ƒRƒs[)‚µAp ‚Í‚»‚ê‚ð put (ƒy[ƒXƒg)‚·‚éB + 5. ‘啶Žš‚Ì R ‚ðƒ^ƒCƒv‚·‚é‚Æ’uŠ·ƒ‚[ƒh‚É“ü‚èA‚ð‰Ÿ‚·‚Æ”²‚¯‚éB + 6. ":set xxx" ‚ƃ^ƒCƒv‚·‚é‚ƃIƒvƒVƒ‡ƒ“ "xxx" ‚ªÝ’肳‚ê‚éB + 'ic' 'ignorecase' ŒŸõŽž‚ɑ啶Žš¬•¶Žš‚Ì‹æ•Ê‚µ‚È‚¢ + 'is' 'incsearch' ŒŸõƒtƒŒ[ƒY‚É•”•ªƒ}ƒbƒ`‚µ‚Ä‚¢‚é•”•ª‚ð•\Ž¦‚·‚é + 'hls' 'hlsearch' ƒ}ƒbƒ`‚·‚é‚·‚×‚ð‹­’²•\Ž¦‚·‚é + ’·‚¢•ûA’Z‚¢•ûA‚Ç‚¿‚ç‚̃IƒvƒVƒ‡ƒ“–¼‚Å‚àŽg—p‚Å‚«‚Ü‚·B + 7. "no" ‚ð•t—^‚µAƒIƒvƒVƒ‡ƒ“‚𖳌ø‚É‚µ‚Ü‚·: :set noic ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ƒŒƒbƒXƒ“ 7: ƒIƒ“ƒ‰ƒCƒ“ƒwƒ‹ƒvƒRƒ}ƒ“ƒh + ƒŒƒbƒXƒ“ 7.1: ƒIƒ“ƒ‰ƒCƒ“ƒwƒ‹ƒvƒRƒ}ƒ“ƒh + ** ƒIƒ“ƒ‰ƒCƒ“ƒwƒ‹ƒv‚ðŽg—p‚µ‚Ü‚µ‚傤 ** @@ -744,20 +862,19 @@ NOTE: - ƒL[‚ð‰Ÿ‚·(‚à‚µ‚ ‚é‚È‚ç‚Î)B - :help ‚ƃ^ƒCƒv‚·‚éB - ƒwƒ‹ƒvƒEƒBƒ“ƒhƒE‚ð•Â‚¶‚é‚É‚Í :q ‚ƃ^ƒCƒv‚µ‚Ü‚·B + ƒwƒ‹ƒvƒEƒBƒ“ƒhƒE‚̃eƒLƒXƒg‚ð“ǂނƁAƒwƒ‹ƒv‚Ì“®ì‚ª—‰ð‚Å‚«‚Ü‚·B + CTRL-W CTRL-W ‚ƃ^ƒCƒv‚·‚é‚Æ ƒwƒ‹ƒvƒEƒBƒ“ƒhƒE‚ÖƒWƒƒƒ“ƒv‚µ‚Ü‚·B + :q ‚ƃ^ƒCƒv‚·‚é‚Æ ƒwƒ‹ƒvƒEƒBƒ“ƒhƒE‚ª•Â‚¶‚ç‚ê‚Ü‚·B - ":help" ƒRƒ}ƒ“ƒh‚Ɉø”‚ð—^‚¦‚邱‚Æ‚É‚æ‚èA‚ ‚ç‚ä‚é‘è–¼‚̃wƒ‹ƒv‚ðŒ©‚Â‚¯‚é - ‚±‚Æ‚ª‚Å‚«‚Ü‚·B‚±‚ê‚ç‚ðŽŽ‚µ‚Ä‚Ý‚Ü‚µ‚傤( ‚ðƒ^ƒCƒv‚µ–Y‚ê‚È‚¢‚悤‚É): + ":help" ƒRƒ}ƒ“ƒh‚Ɉø”‚ð—^‚¦‚邱‚Æ‚É‚æ‚èA‚ ‚ç‚ä‚é‘è–¼‚̃wƒ‹ƒv‚ðŒ©‚Â‚¯‚邱‚Æ + ‚ª‚Å‚«‚Ü‚·B‚±‚ê‚ç‚ðŽŽ‚µ‚Ä‚Ý‚Ü‚µ‚傤( ‚ðƒ^ƒCƒv‚µ–Y‚ê‚È‚¢‚悤‚É): :help w :help c_ ‚ŃRƒ}ƒ“ƒhƒ‰ƒCƒ“‚ð•âŠ®‚·‚é ** + + 1. ƒRƒ“ƒpƒ`ƒ‚[ƒh‚Å‚È‚¢‚±‚Æ‚ðŠm”F‚µ‚Ü‚·: :set nocp + + 2. Œ»Ý‚̃fƒBƒŒƒNƒgƒŠ‚ɍ݂éƒtƒ@ƒCƒ‹‚ð :!ls ‚© :!dir ‚ÅŠm”F‚µ‚Ü‚·B + + 3. ƒRƒ}ƒ“ƒh‚ÌŠJŽn‚ðƒ^ƒCƒv‚µ‚Ü‚·: :e + + 4. CTRL-D ‚ð‰Ÿ‚·‚Æ Vim ‚Í "e" ‚©‚çŽn‚Ü‚éƒRƒ}ƒ“ƒh‚̈ꗗ‚ð•\Ž¦‚µ‚Ü‚·B + + 5. ‚ð‰Ÿ‚·‚Æ Vim ‚Í ":edit" ‚Æ‚¢‚¤ƒRƒ}ƒ“ƒh–¼‚ð•âŠ®‚µ‚Ü‚·B + + 6. ‚³‚ç‚ɋ󔒂ƁAŠù‘¶‚̃tƒ@ƒCƒ‹–¼‚ÌŽn‚Ü‚è‚ð‰Á‚¦‚Ü‚·: :edit FIL + + 7. ‚ð‰Ÿ‚·‚Æ Vim ‚Í–¼‘O‚ð•âŠ®‚µ‚Ü‚·B(‚à‚µˆê‚‚µ‚©–³‚©‚Á‚½ê‡) + +NOTE: •âŠ®‚Í‘½‚­‚̃Rƒ}ƒ“ƒh‚Å“®ì‚µ‚Ü‚·B‚»‚µ‚Ä CTRL-D ‚Æ ‰Ÿ‚µ‚Ä‚Ý‚Ä‚­‚¾ + ‚³‚¢B“Á‚É :help ‚̍ۂɖ𗧂¿‚Ü‚·B + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ƒŒƒbƒXƒ“ 7 —v–ñ + + + 1. ƒwƒ‹ƒvƒEƒBƒ“ƒhƒE‚ðŠJ‚­‚É‚Í :help ‚Æ‚·‚é‚© ‚à‚µ‚­‚Í ‚ð‰Ÿ‚·B + + 2. ƒRƒ}ƒ“ƒh(cmd)‚̃wƒ‹ƒv‚ðŒŸõ‚·‚é‚É‚Í :help cmd ‚ƃ^ƒCƒv‚·‚éB + + 3. •Ê‚̃EƒBƒ“ƒhƒE‚ÖƒWƒƒƒ“ƒv‚·‚é‚É‚Í CTRL-W CTRL-W ‚ƃ^ƒCƒv‚·‚éB + + 4. ƒwƒ‹ƒvƒEƒBƒ“ƒhƒE‚ð•Â‚¶‚é‚É‚Í :q ‚ƃ^ƒCƒv‚·‚éB + + 5. ‚¨D‚݂̐ݒè‚ð•Û‚Â‚É‚Í vimrc ‹N“®ƒXƒNƒŠƒvƒg‚ðì¬‚·‚éB + + 6. : command ‚ʼn”\‚ȕ⊮‚ðŒ©‚é‚É‚Í CTRL-D ‚ðƒ^ƒCƒv‚·‚éB + •âŠ®‚ðŽg—p‚·‚é‚É‚Í ‚ð‰Ÿ‚·B + + + + + + + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ‚±‚ê‚É‚Ä Vim ‚̃`ƒ…[ƒgƒŠƒAƒ‹‚ðI‚í‚è‚Ü‚·BƒGƒfƒBƒ^‚ðŠÈ’P‚ɁA‚µ‚©‚à[•ª‚É @@ -805,7 +968,8 @@ NOTE: Modified for Vim by Bram Moolenaar. - “ú–{Œê–ó ¼–{‘׍O E-mail:mattn@mail.goo.ne.jp + “ú–{Œê–ó ¼–{ ‘׍O + ŠÄC ‘º‰ª ‘¾˜Y ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - vi:set ts=8 sts=4 sw=4 tw=76: + vi:set ts=8 sts=4 sw=4 tw=78: diff --git a/src/Makefile b/src/Makefile index a4b7d207c..1cdfd742d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -547,6 +547,10 @@ LINT_OPTIONS = -beprxzF #PROFILE_CFLAGS = -DEXITFREE #PROFILE_LIBS = -lccmalloc +# MAC OS X platform +#MAC_OSX_ARCH = -arch ppc +MAC_OSX_ARCH = -arch i386 -arch ppc + ##################################################### ### Specific systems, check if yours is listed! ### {{{ ##################################################### @@ -1197,11 +1201,11 @@ PHOTONGUI_BUNDLE = # CARBON GUI CARBONGUI_SRC = gui.c gui_mac.c CARBONGUI_OBJ = objects/gui.o objects/gui_mac.o objects/pty.o -CARBONGUI_DEFS = -DFEAT_GUI_MAC -arch ppc -fno-common -fpascal-strings \ +CARBONGUI_DEFS = -DFEAT_GUI_MAC $(MAC_OSX_ARCH) -fno-common -fpascal-strings \ -Wall -Wno-unknown-pragmas \ -mdynamic-no-pic -pipe CARBONGUI_IPATH = -I. -Iproto -CARBONGUI_LIBS_DIR = +CARBONGUI_LIBS_DIR = $(MAC_OSX_ARCH) CARBONGUI_LIBS1 = -framework Carbon CARBONGUI_LIBS2 = CARBONGUI_INSTALL = install_macosx diff --git a/src/configure.in b/src/configure.in index 4324101b8..913d3e9a4 100644 --- a/src/configure.in +++ b/src/configure.in @@ -106,7 +106,7 @@ if test "`(uname) 2>/dev/null`" = Darwin; then MACOSX=yes OS_EXTRA_SCR="os_macosx.c os_mac_conv.c"; OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o" - CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -I/Developer/Headers/FlatCarbon -no-cpp-precomp" + CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -I/Developer/Headers/FlatCarbon -no-cpp-precomp -arch i386 -arch ppc" dnl If Carbon is found, assume we don't want X11 dnl unless it was specifically asked for (--with-x) diff --git a/src/edit.c b/src/edit.c index cb78cd62d..b57b56707 100644 --- a/src/edit.c +++ b/src/edit.c @@ -2845,7 +2845,7 @@ ins_compl_addfrommatch() int c; p = compl_shown_match->cp_str; - if (STRLEN(p) <= len) /* the match is too short */ + if ((int)STRLEN(p) <= len) /* the match is too short */ return; p += len; #ifdef FEAT_MBYTE diff --git a/src/eval.c b/src/eval.c index b0202cdb3..f857b8fc9 100644 --- a/src/eval.c +++ b/src/eval.c @@ -621,7 +621,9 @@ static void f_synID __ARGS((typval_T *argvars, typval_T *rettv)); static void f_synIDattr __ARGS((typval_T *argvars, typval_T *rettv)); static void f_synIDtrans __ARGS((typval_T *argvars, typval_T *rettv)); static void f_system __ARGS((typval_T *argvars, typval_T *rettv)); +static void f_tabpagebuflist __ARGS((typval_T *argvars, typval_T *rettv)); static void f_tabpagenr __ARGS((typval_T *argvars, typval_T *rettv)); +static void f_tabpagewinnr __ARGS((typval_T *argvars, typval_T *rettv)); static void f_taglist __ARGS((typval_T *argvars, typval_T *rettv)); static void f_tagfiles __ARGS((typval_T *argvars, typval_T *rettv)); static void f_tempname __ARGS((typval_T *argvars, typval_T *rettv)); @@ -6984,7 +6986,9 @@ static struct fst {"synIDattr", 2, 3, f_synIDattr}, {"synIDtrans", 1, 1, f_synIDtrans}, {"system", 1, 2, f_system}, + {"tabpagebuflist", 0, 1, f_tabpagebuflist}, {"tabpagenr", 0, 1, f_tabpagenr}, + {"tabpagewinnr", 1, 2, f_tabpagewinnr}, {"tagfiles", 0, 0, f_tagfiles}, {"taglist", 1, 1, f_taglist}, {"tempname", 0, 0, f_tempname}, @@ -14869,6 +14873,52 @@ done: rettv->vval.v_string = res; } +/* + * "tabpagebuflist()" function + */ +/* ARGSUSED */ + static void +f_tabpagebuflist(argvars, rettv) + typval_T *argvars; + typval_T *rettv; +{ +#ifndef FEAT_WINDOWS + rettv->vval.v_number = 0; +#else + tabpage_T *tp; + win_T *wp = NULL; + list_T *l; + + if (argvars[0].v_type == VAR_UNKNOWN) + wp = firstwin; + else + { + tp = find_tabpage((int)get_tv_number(&argvars[0])); + if (tp != NULL) + wp = tp->tp_firstwin; + } + if (wp == NULL) + rettv->vval.v_number = 0; + else + { + l = list_alloc(); + if (l == NULL) + rettv->vval.v_number = 0; + else + { + rettv->vval.v_list = l; + rettv->v_type = VAR_LIST; + ++l->lv_refcount; + + for (; wp != NULL; wp = wp->w_next) + if (list_append_number(l, wp->w_buffer->b_fnum) == FAIL) + break; + } + } +#endif +} + + /* * "tabpagenr()" function */ @@ -14903,6 +14953,75 @@ f_tabpagenr(argvars, rettv) rettv->vval.v_number = nr; } + +#ifdef FEAT_WINDOWS +static int get_winnr __ARGS((tabpage_T *tp, typval_T *argvar)); + +/* + * Common code for tabpagewinnr() and winnr(). + */ + static int +get_winnr(tp, argvar) + tabpage_T *tp; + typval_T *argvar; +{ + win_T *twin; + int nr = 1; + win_T *wp; + char_u *arg; + + twin = (tp == curtab) ? curwin : tp->tp_curwin; + if (argvar->v_type != VAR_UNKNOWN) + { + arg = get_tv_string_chk(argvar); + if (arg == NULL) + nr = 0; /* type error; errmsg already given */ + else if (STRCMP(arg, "$") == 0) + twin = (tp == curtab) ? lastwin : tp->tp_lastwin; + else if (STRCMP(arg, "#") == 0) + { + twin = (tp == curtab) ? prevwin : tp->tp_prevwin; + if (twin == NULL) + nr = 0; + } + else + { + EMSG2(_(e_invexpr2), arg); + nr = 0; + } + } + + if (nr > 0) + for (wp = (tp == curtab) ? firstwin : tp->tp_firstwin; + wp != twin; wp = wp->w_next) + ++nr; + return nr; +} +#endif + +/* + * "tabpagewinnr()" function + */ +/* ARGSUSED */ + static void +f_tabpagewinnr(argvars, rettv) + typval_T *argvars; + typval_T *rettv; +{ + int nr = 1; +#ifdef FEAT_WINDOWS + tabpage_T *tp; + + tp = find_tabpage((int)get_tv_number(&argvars[0])); + if (tp == NULL) + nr = 0; + else + nr = get_winnr(tp, &argvars[1]); +#endif + rettv->vval.v_number = nr; +} + + /* * "tagfiles()" function */ @@ -15357,34 +15476,9 @@ f_winnr(argvars, rettv) typval_T *rettv; { int nr = 1; -#ifdef FEAT_WINDOWS - win_T *wp; - win_T *twin = curwin; - char_u *arg; - if (argvars[0].v_type != VAR_UNKNOWN) - { - arg = get_tv_string_chk(&argvars[0]); - if (arg == NULL) - nr = 0; /* type error; errmsg already given */ - else if (STRCMP(arg, "$") == 0) - twin = lastwin; - else if (STRCMP(arg, "#") == 0) - { - twin = prevwin; - if (prevwin == NULL) - nr = 0; - } - else - { - EMSG2(_(e_invexpr2), arg); - nr = 0; - } - } - - if (nr > 0) - for (wp = firstwin; wp != twin; wp = wp->w_next) - ++nr; +#ifdef FEAT_WINDOWS + nr = get_winnr(curtab, &argvars[0]); #endif rettv->vval.v_number = nr; } diff --git a/src/ex_cmds.c b/src/ex_cmds.c index c6cdc5a50..5e4d59840 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -3425,7 +3425,7 @@ do_ecmd(fnum, ffname, sfname, eap, newlnum, flags) * autocommands. This allows for the autocommands to position the * cursor. */ - win_init(curwin); + curwin_init(); #ifdef FEAT_FOLDING /* It's like all lines in the buffer changed. Need to update diff --git a/src/ex_cmds.h b/src/ex_cmds.h index 9ab8b885a..49e86a458 100644 --- a/src/ex_cmds.h +++ b/src/ex_cmds.h @@ -881,11 +881,11 @@ EX(CMD_tab, "tab", ex_tab, RANGE|NOTADR|COUNT|TRLBAR), EX(CMD_tabclose, "tabclose", ex_tabclose, RANGE|NOTADR|COUNT|BANG|TRLBAR|CMDWIN), -EX(CMD_tabedit, "tabedit", ex_tabedit, +EX(CMD_tabedit, "tabedit", ex_splitview, BANG|FILE1|RANGE|NOTADR|EDITCMD|ARGOPT|TRLBAR), -EX(CMD_tabfind, "tabfind", ex_tabedit, +EX(CMD_tabfind, "tabfind", ex_splitview, BANG|FILE1|RANGE|NOTADR|EDITCMD|ARGOPT|NEEDARG|TRLBAR), -EX(CMD_tabnew, "tabnew", ex_tabedit, +EX(CMD_tabnew, "tabnew", ex_splitview, BANG|FILE1|RANGE|NOTADR|EDITCMD|ARGOPT|TRLBAR), EX(CMD_tabonly, "tabonly", ex_tabonly, TRLBAR|CMDWIN), diff --git a/src/globals.h b/src/globals.h index 0cea5c28b..23fdd6673 100644 --- a/src/globals.h +++ b/src/globals.h @@ -495,6 +495,7 @@ EXTERN win_T *prevwin INIT(= NULL); /* previous window */ # define lastwin curwin # define W_NEXT(wp) NULL # define FOR_ALL_WINDOWS(wp) wp = curwin; +# define FOR_ALL_TAB_WINDOWS(tp, wp) wp = curwin; #endif EXTERN win_T *curwin; /* currently active window */ diff --git a/src/hardcopy.c b/src/hardcopy.c index 5cfeb8bbc..61905b0a7 100644 --- a/src/hardcopy.c +++ b/src/hardcopy.c @@ -475,6 +475,7 @@ prt_header(psettings, pagenum, lnum) if (*p_header != NUL) { linenr_T tmp_lnum, tmp_topline, tmp_botline; + int use_sandbox = FALSE; /* * Need to (temporarily) set current line number and first/last line @@ -490,8 +491,12 @@ prt_header(psettings, pagenum, lnum) curwin->w_botline = lnum + 63; printer_page_num = pagenum; +# ifdef FEAT_EVAL + use_sandbox = was_set_insecurely((char_u *)"printheader"); +# endif build_stl_str_hl(curwin, tbuf, (size_t)(width + IOSIZE), - p_header, ' ', width, NULL); + p_header, use_sandbox, + ' ', width, NULL); /* Reset line numbers */ curwin->w_cursor.lnum = tmp_lnum; diff --git a/src/option.c b/src/option.c index e955f7f03..601a97aa2 100644 --- a/src/option.c +++ b/src/option.c @@ -1142,7 +1142,7 @@ static struct vimoption {(char_u *)FALSE, (char_u *)0L}}, {"highlight", "hl", P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP, (char_u *)&p_hl, PV_NONE, - {(char_u *)"8:SpecialKey,@:NonText,d:Directory,e:ErrorMsg,i:IncSearch,l:Search,m:MoreMsg,M:ModeMsg,n:LineNr,r:Question,s:StatusLine,S:StatusLineNC,c:VertSplit,t:Title,v:Visual,V:VisualNOS,w:WarningMsg,W:WildMenu,f:Folded,F:FoldColumn,A:DiffAdd,C:DiffChange,D:DiffDelete,T:DiffText,>:SignColumn,B:SpellBad,P:SpellCap,R:SpellRare,L:SpellLocal,+:Pmenu,=:PmenuSel,x:PmenuSbar,X:PmenuThumb,*:TabPage,#:TabPageSel,_:TabPageFill", + {(char_u *)"8:SpecialKey,@:NonText,d:Directory,e:ErrorMsg,i:IncSearch,l:Search,m:MoreMsg,M:ModeMsg,n:LineNr,r:Question,s:StatusLine,S:StatusLineNC,c:VertSplit,t:Title,v:Visual,V:VisualNOS,w:WarningMsg,W:WildMenu,f:Folded,F:FoldColumn,A:DiffAdd,C:DiffChange,D:DiffDelete,T:DiffText,>:SignColumn,B:SpellBad,P:SpellCap,R:SpellRare,L:SpellLocal,+:Pmenu,=:PmenuSel,x:PmenuSbar,X:PmenuThumb,*:TabLine,#:TabLineSel,_:TabLineFill", (char_u *)0L}}, {"history", "hi", P_NUM|P_VIM, (char_u *)&p_hi, PV_NONE, @@ -2046,6 +2046,13 @@ static struct vimoption {"showmode", "smd", P_BOOL|P_VIM, (char_u *)&p_smd, PV_NONE, {(char_u *)FALSE, (char_u *)TRUE}}, + {"showtabline", "stal", P_NUM|P_VI_DEF|P_RALL, +#ifdef FEAT_WINDOWS + (char_u *)&p_stal, PV_NONE, +#else + (char_u *)NULL, PV_NONE, +#endif + {(char_u *)1L, (char_u *)0L}}, {"sidescroll", "ss", P_NUM|P_VI_DEF, (char_u *)&p_ss, PV_NONE, {(char_u *)0L, (char_u *)0L}}, @@ -2181,13 +2188,13 @@ static struct vimoption {(char_u *)0L, (char_u *)0L} #endif }, - {"tabline", "tal", P_NUM|P_VI_DEF|P_RALL, -#ifdef FEAT_WINDOWS + {"tabline", "tal", P_STRING|P_VI_DEF|P_RALL, +#ifdef FEAT_STL_OPT (char_u *)&p_tal, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)1L, (char_u *)0L}}, + {(char_u *)"", (char_u *)0L}}, {"tabstop", "ts", P_NUM|P_VI_DEF|P_RBUF, (char_u *)&p_ts, PV_TS, {(char_u *)8L, (char_u *)0L}}, @@ -3181,8 +3188,10 @@ set_option_default(opt_idx, opt_flags, compatible) *(int *)varp; } - /* the default value is not insecure */ - options[opt_idx].flags &= ~P_INSECURE; + /* The default value is not insecure. But if there are local values + * we can't be sure. */ + if (options[opt_idx].indir == PV_NONE) + options[opt_idx].flags &= ~P_INSECURE; } #ifdef FEAT_EVAL @@ -3351,12 +3360,12 @@ set_init_2() static char_u * term_bg_default() { - char_u *p; - #if defined(MSDOS) || defined(OS2) || defined(WIN3264) /* DOS console nearly always black */ return (char_u *)"dark"; #else + char_u *p; + if (STRCMP(T_NAME, "linux") == 0 || STRCMP(T_NAME, "screen.linux") == 0 || STRCMP(T_NAME, "cygwin") == 0 @@ -4462,14 +4471,14 @@ did_set_option(opt_idx, opt_flags, new_value) /* When an option is set in the sandbox, from a modeline or in secure mode * set the P_INSECURE flag. Otherwise, if a new value is stored reset the - * flag. */ + * flag. But not when there are local values. */ if (secure #ifdef HAVE_SANDBOX || sandbox != 0 #endif || (opt_flags & OPT_MODELINE)) options[opt_idx].flags |= P_INSECURE; - else if (new_value) + else if (new_value && options[opt_idx].indir == PV_NONE) options[opt_idx].flags &= ~P_INSECURE; } @@ -7284,7 +7293,7 @@ set_num_option(opt_idx, varp, value, errbuf, errbuflen, opt_flags) } /* (re)set tab page line */ - else if (pp == &p_tal) + else if (pp == &p_stal) { shell_new_rows(); /* recompute window positions and heights */ } diff --git a/src/option.h b/src/option.h index d3c01ecd1..4dac4cc33 100644 --- a/src/option.h +++ b/src/option.h @@ -577,7 +577,7 @@ EXTERN char_u *p_lispwords; /* 'lispwords' */ #endif #ifdef FEAT_WINDOWS EXTERN long p_ls; /* 'laststatus' */ -EXTERN long p_tal; /* 'tabline' */ +EXTERN long p_stal; /* 'showtabline' */ #endif EXTERN char_u *p_lcs; /* 'listchars' */ @@ -716,6 +716,9 @@ EXTERN int p_scs; /* 'smartcase' */ EXTERN int p_sta; /* 'smarttab' */ #ifdef FEAT_WINDOWS EXTERN int p_sb; /* 'splitbelow' */ +# if defined(FEAT_STL_OPT) +EXTERN char_u *p_tal; /* 'tabline' */ +# endif #endif #ifdef FEAT_SYN_HL EXTERN char_u *p_sps; /* 'spellsuggest' */ diff --git a/src/proto/window.pro b/src/proto/window.pro index 7fa357270..cda7b060d 100644 --- a/src/proto/window.pro +++ b/src/proto/window.pro @@ -11,7 +11,7 @@ void win_close __ARGS((win_T *win, int free_buf)); void win_close_othertab __ARGS((win_T *win, int free_buf, tabpage_T *tp)); void win_free_all __ARGS((void)); void close_others __ARGS((int message, int forceit)); -void win_init __ARGS((win_T *wp)); +void curwin_init __ARGS((void)); int win_alloc_first __ARGS((void)); void win_init_size __ARGS((void)); int win_new_tabpage __ARGS((void)); diff --git a/src/quickfix.c b/src/quickfix.c index 7243e1bdf..2ffce40a8 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -2887,11 +2887,14 @@ ex_vimgrep(eap) int found_match; buf_T *first_match_buf = NULL; time_t seconds = 0; + int save_mls; #if defined(FEAT_AUTOCMD) && defined(FEAT_SYN_HL) char_u *save_ei = NULL; - aco_save_T aco; #endif -#ifdef FEAT_AUTOCMD +#ifndef FEAT_AUTOCMD + buf_T *save_curbuf; +#else + aco_save_T aco; char_u *au_name = NULL; int flags = 0; colnr_T col; @@ -2999,11 +3002,15 @@ ex_vimgrep(eap) * indent scripts, a great speed improvement. */ save_ei = au_event_disable(",Filetype"); #endif + /* Don't use modelines here, it's useless. */ + save_mls = p_mls; + p_mls = 0; /* Load file into a buffer, so that 'fileencoding' is detected, * autocommands applied, etc. */ buf = load_dummy_buffer(fnames[fi]); + p_mls = save_mls; #if defined(FEAT_AUTOCMD) && defined(FEAT_SYN_HL) au_event_restore(save_ei); #endif @@ -3089,19 +3096,30 @@ ex_vimgrep(eap) } } -#if defined(FEAT_AUTOCMD) && defined(FEAT_SYN_HL) if (buf != NULL) { /* The buffer is still loaded, the Filetype autocommands - * need to be done now, in that buffer. And then the - * modelines need to be done (again). */ + * need to be done now, in that buffer. And the modelines + * need to be done (again). */ +#if defined(FEAT_AUTOCMD) aucmd_prepbuf(&aco, buf); +#else + save_curbuf = curbuf; + curbuf = buf; + curwin->w_buffer = curbuf; +#endif +#if defined(FEAT_AUTOCMD) && defined(FEAT_SYN_HL) apply_autocmds(EVENT_FILETYPE, buf->b_p_ft, buf->b_fname, TRUE, buf); +#endif do_modelines(FALSE); +#if defined(FEAT_AUTOCMD) aucmd_restbuf(&aco); - } +#else + curbuf = save_curbuf; + curwin->w_buffer = curbuf; #endif + } } } } diff --git a/src/screen.c b/src/screen.c index f36ac81a4..d6b9b7d55 100644 --- a/src/screen.c +++ b/src/screen.c @@ -168,7 +168,7 @@ static int win_do_lines __ARGS((win_T *wp, int row, int line_count, int mayclear static void win_rest_invalid __ARGS((win_T *wp)); static void msg_pos_mode __ARGS((void)); #if defined(FEAT_WINDOWS) -static void draw_tabpage __ARGS((void)); +static void draw_tabline __ARGS((void)); #endif #if defined(FEAT_WINDOWS) || defined(FEAT_WILDMENU) || defined(FEAT_STL_OPT) static int fillchar_status __ARGS((int *attr, int is_curwin)); @@ -420,7 +420,7 @@ update_screen(type) #ifdef FEAT_LINEBREAK /* Force redraw when width of 'number' column changes. */ if (curwin->w_redr_type < NOT_VALID - && curwin->w_nrwidth != number_width(curwin)) + && curwin->w_nrwidth != (curwin->w_p_nu ? number_width(curwin) : 0)) curwin->w_redr_type = NOT_VALID; #endif @@ -477,7 +477,7 @@ update_screen(type) #ifdef FEAT_WINDOWS /* Redraw the tab pages line if needed. */ if (redraw_tabline || type >= NOT_VALID) - draw_tabpage(); + draw_tabline(); #endif /* @@ -707,7 +707,7 @@ updateWindow(wp) #ifdef FEAT_WINDOWS /* When the screen was cleared redraw the tab pages line. */ if (redraw_tabline) - draw_tabpage(); + draw_tabline(); if (wp->w_redr_status # ifdef FEAT_CMDL_INFO @@ -845,11 +845,11 @@ win_update(wp) #ifdef FEAT_LINEBREAK /* Force redraw when width of 'number' column changes. */ - i = number_width(curwin); - if (curwin->w_nrwidth != i) + i = wp->w_p_nu ? number_width(wp) : 0; + if (wp->w_nrwidth != i) { type = NOT_VALID; - curwin->w_nrwidth = i; + wp->w_nrwidth = i; } else #endif @@ -4965,7 +4965,7 @@ redraw_statuslines() if (wp->w_redr_status) win_redr_status(wp); if (redraw_tabline) - draw_tabpage(); + draw_tabline(); } #endif @@ -5543,7 +5543,8 @@ get_keymap_str(wp, buf, len) #if defined(FEAT_STL_OPT) || defined(PROTO) /* - * Redraw the status line or ruler of window wp. + * Redraw the status line or ruler of window "wp". + * When "wp" is NULL redraw the tab pages line from 'tabline'. */ static void win_redr_custom(wp, draw_ruler) @@ -5562,56 +5563,88 @@ win_redr_custom(wp, draw_ruler) char_u buf[MAXPATHL]; char_u *p; struct stl_hlrec hl[STL_MAX_ITEM]; + int use_sandbox = FALSE; /* setup environment for the task at hand */ - row = W_WINROW(wp) + wp->w_height; - fillchar = fillchar_status(&attr, wp == curwin); - maxwidth = W_WIDTH(wp); - if (*wp->w_p_stl != NUL) - p = wp->w_p_stl; + if (wp == NULL) + { + /* Use 'tabline'. Always at the first line of the screen. */ + p = p_tal; + row = 0; + fillchar = t_colors < 8 ? '_' : ' '; + attr = hl_attr(HLF_TPF); + maxwidth = Columns; +# ifdef FEAT_EVAL + use_sandbox = was_set_insecurely((char_u *)"tabline"); +# endif + } else - p = p_stl; - if (draw_ruler) { - p = p_ruf; - /* advance past any leading group spec - implicit in ru_col */ - if (*p == '%') + row = W_WINROW(wp) + wp->w_height; + fillchar = fillchar_status(&attr, wp == curwin); + maxwidth = W_WIDTH(wp); + + if (draw_ruler) { - if (*++p == '-') - p++; - if (atoi((char *) p)) - while (VIM_ISDIGIT(*p)) + p = p_ruf; + /* advance past any leading group spec - implicit in ru_col */ + if (*p == '%') + { + if (*++p == '-') p++; - if (*p++ != '(') - p = p_ruf; - } + if (atoi((char *) p)) + while (VIM_ISDIGIT(*p)) + p++; + if (*p++ != '(') + p = p_ruf; + } #ifdef FEAT_VERTSPLIT - col = ru_col - (Columns - W_WIDTH(wp)); - if (col < (W_WIDTH(wp) + 1) / 2) - col = (W_WIDTH(wp) + 1) / 2; + col = ru_col - (Columns - W_WIDTH(wp)); + if (col < (W_WIDTH(wp) + 1) / 2) + col = (W_WIDTH(wp) + 1) / 2; #else - col = ru_col; - if (col > (Columns + 1) / 2) - col = (Columns + 1) / 2; + col = ru_col; + if (col > (Columns + 1) / 2) + col = (Columns + 1) / 2; #endif - maxwidth = W_WIDTH(wp) - col; + maxwidth = W_WIDTH(wp) - col; #ifdef FEAT_WINDOWS - if (!wp->w_status_height) + if (!wp->w_status_height) #endif + { + row = Rows - 1; + --maxwidth; /* writing in last column may cause scrolling */ + fillchar = ' '; + attr = 0; + } + +# ifdef FEAT_EVAL + use_sandbox = was_set_insecurely((char_u *)"rulerformat"); +# endif + } + else { - row = Rows - 1; - --maxwidth; /* writing in last column may cause scrolling */ - fillchar = ' '; - attr = 0; + if (*wp->w_p_stl != NUL) + p = wp->w_p_stl; + else + p = p_stl; +# ifdef FEAT_EVAL + use_sandbox = was_set_insecurely((char_u *)"statusline"); +# endif } + +#ifdef FEAT_VERTSPLIT + col += W_WINCOL(wp); +#endif } + if (maxwidth <= 0) return; -#ifdef FEAT_VERTSPLIT - col += W_WINCOL(wp); -#endif - width = build_stl_str_hl(wp, buf, sizeof(buf), p, fillchar, maxwidth, hl); + width = build_stl_str_hl(wp == NULL ? curwin : wp, + buf, sizeof(buf), + p, use_sandbox, + fillchar, maxwidth, hl); len = STRLEN(buf); while (width < maxwidth && len < sizeof(buf) - 1) @@ -6822,7 +6855,7 @@ screenalloc(clear) new_TabPageIdxs = (char_u *)lalloc((long_u)(Columns * sizeof(char_u)), FALSE); #endif - FOR_ALL_WINDOWS(wp) + FOR_ALL_TAB_WINDOWS(tp, wp) { if (win_alloc_lines(wp) == FAIL) { @@ -8456,14 +8489,13 @@ unshowmode(force) * Draw the tab pages line at the top of the Vim window. */ static void -draw_tabpage() +draw_tabline() { int tabcount = 0; tabpage_T *tp; int tabwidth; int col = 0; int scol = 0; - int had_current = FALSE; int attr; win_T *wp; win_T *cwp; @@ -8475,12 +8507,27 @@ draw_tabpage() int attr_nosel = hl_attr(HLF_TP); int attr_fill = hl_attr(HLF_TPF); char_u *p; + int room; + int use_sep_chars = (t_colors < 8 +#ifdef FEAT_GUI + && !gui.in_use +#endif + ); redraw_tabline = FALSE; if (tabpageline_height() < 1) return; +#if defined(FEAT_STL_OPT) + /* Use the 'tabline' option if it's set. */ + if (*p_tal != NUL) + { + win_redr_custom(NULL, FALSE); + return; + } +#endif + for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) ++tabcount; @@ -8495,17 +8542,9 @@ draw_tabpage() scol = col; if (tp->tp_topframe == topframe) - { - c = '/'; - had_current = TRUE; attr = attr_sel; - } - else if (!had_current) - c = '/'; - else - c = '\\'; - if (t_colors < 8) - screen_putchar(c, 0, col++, attr); + if (use_sep_chars && col > 0) + screen_putchar('|', 0, col++, attr); if (tp->tp_topframe != topframe) attr = attr_nosel; @@ -8531,32 +8570,49 @@ draw_tabpage() { if (wincount > 1) { - vim_snprintf((char *)NameBuff, MAXPATHL, "#%d", wincount); + vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); len = STRLEN(NameBuff); - screen_puts_len(NameBuff, len, 0, col, attr); + screen_puts_len(NameBuff, len, 0, col, +#if defined(FEAT_SYN_HL) + hl_combine_attr(attr, hl_attr(HLF_T)) +#else + attr +#endif + ); col += len; } if (modified) - screen_puts_len((char_u *)"+", 2, 0, col++, attr); + screen_puts_len((char_u *)"+", 1, 0, col++, attr); screen_putchar(' ', 0, col++, attr); } - if (buf_spname(cwp->w_buffer) != NULL) - STRCPY(NameBuff, buf_spname(cwp->w_buffer)); - else - home_replace(cwp->w_buffer, cwp->w_buffer->b_fname, NameBuff, - MAXPATHL, TRUE); - trans_characters(NameBuff, MAXPATHL); - len = STRLEN(NameBuff); - p = NameBuff; - if (len > scol - col + tabwidth - 1) /* TODO: multi-byte chars */ + room = scol - col + tabwidth - 1; + if (room > 0) { - p += len - (scol - col + tabwidth - 1); - len = scol - col + tabwidth - 1; - } - if (len > 0) - { - screen_puts_len(p, len, 0, col, attr); + if (buf_spname(cwp->w_buffer) != NULL) + STRCPY(NameBuff, buf_spname(cwp->w_buffer)); + else + home_replace(cwp->w_buffer, cwp->w_buffer->b_fname, NameBuff, + MAXPATHL, TRUE); + trans_characters(NameBuff, MAXPATHL); + len = vim_strsize(NameBuff); + p = NameBuff; +#ifdef FEAT_MBYTE + if (has_mbyte) + while (len > room) + { + len -= ptr2cells(p); + mb_ptr_adv(p); + } + else +#endif + if (len > room) + { + p += len - room; + len = room; + } + + screen_puts_len(p, STRLEN(p), 0, col, attr); col += len; } screen_putchar(' ', 0, col++, attr); @@ -8568,11 +8624,8 @@ draw_tabpage() TabPageIdxs[scol++] = tabcount; } - if (t_colors < 8) - { - screen_putchar('\\', 0, col++, attr); + if (use_sep_chars) c = '_'; - } else c = ' '; screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); @@ -8902,7 +8955,7 @@ win_redr_ruler(wp, always) #if defined(FEAT_LINEBREAK) || defined(PROTO) /* * Return the width of the 'number' column. - * Zero when 'number' isn't set. + * Caller may need to check if 'number' is set. * Otherwise it depends on 'numberwidth' and the line count. */ int @@ -8912,9 +8965,6 @@ number_width(wp) int n; linenr_T lnum; - if (!wp->w_p_nu) - return 0; - lnum = wp->w_buffer->b_ml.ml_line_count; if (lnum == wp->w_nrwidth_line_count) return wp->w_nrwidth_width; diff --git a/src/structs.h b/src/structs.h index fac17856d..e5f59f236 100644 --- a/src/structs.h +++ b/src/structs.h @@ -1578,6 +1578,7 @@ struct tabpage_S buf_T *(tp_diffbuf[DB_COUNT]); int tp_diff_invalid; /* list of diffs is outdated */ #endif + frame_T *tp_snapshot; /* window layout snapshot */ }; /* diff --git a/src/syntax.c b/src/syntax.c index 2574f3d47..45601539d 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -6079,8 +6079,8 @@ static char *(highlight_init_both[]) = "DiffText term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red", "PmenuThumb cterm=reverse gui=reverse", "PmenuSbar ctermbg=Grey guibg=Grey", - "TabPageSel term=bold cterm=bold gui=bold", - "TabPageFill term=reverse cterm=reverse gui=reverse", + "TabLineSel term=bold cterm=bold gui=bold", + "TabLineFill term=reverse cterm=reverse gui=reverse", NULL }; @@ -6109,7 +6109,7 @@ static char *(highlight_init_light[]) = "DiffAdd term=bold ctermbg=LightBlue guibg=LightBlue", "DiffChange term=bold ctermbg=LightMagenta guibg=LightMagenta", "DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan gui=bold guifg=Blue guibg=LightCyan", - "TabPage term=underline cterm=underline ctermbg=LightGrey gui=underline guibg=LightGrey", + "TabLine term=underline cterm=underline ctermbg=LightGrey gui=underline guibg=LightGrey", NULL }; @@ -6138,7 +6138,7 @@ static char *(highlight_init_dark[]) = "DiffAdd term=bold ctermbg=DarkBlue guibg=DarkBlue", "DiffChange term=bold ctermbg=DarkMagenta guibg=DarkMagenta", "DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan gui=bold guifg=Blue guibg=DarkCyan", - "TabPage term=underline cterm=underline ctermbg=DarkGrey gui=underline guibg=DarkGrey", + "TabLine term=underline cterm=underline ctermbg=DarkGrey gui=underline guibg=DarkGrey", NULL }; diff --git a/src/version.h b/src/version.h index e09294a0b..94588104b 100644 --- a/src/version.h +++ b/src/version.h @@ -36,5 +36,5 @@ #define VIM_VERSION_NODOT "vim70aa" #define VIM_VERSION_SHORT "7.0aa" #define VIM_VERSION_MEDIUM "7.0aa ALPHA" -#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2006 Feb 18)" -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2006 Feb 18, compiled " +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2006 Feb 20)" +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2006 Feb 20, compiled "