updated for version 7.0202
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 2ca301b..4899648 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 @@
|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 @@
where this option was set, and <amatch> 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 9bad529..474f863 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 @@
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 @@
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 @@
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 @@
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 c17074c..53b9899 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 @@
{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 @@
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 @@
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 ff3b7f9..d839e25 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 @@
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 514ca29..517c4dd 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -718,6 +718,7 @@
'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 @@
'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 @@
: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 @@
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-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-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 4c65d1d..94218ec 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 @@
*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: <Up> and <Down> don't insert completion, <PageUp> and <PageDown>
+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 @@
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 a7cb743..05908d0 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 @@
*: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 0b59fa1..377eba9 100644
--- a/runtime/syntax/colortest.vim
+++ b/runtime/syntax/colortest.vim
@@ -1,7 +1,7 @@
" Vim script for testing colors
" Maintainer: Bram Moolenaar <Bram@vim.org>
" 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('<sfile>:p')
- exe "edit " . expand('<sfile>')
+ if &mod || line('$') != 1 || getline(1) != ''
+ exe "new " . expand('<sfile>')
+ else
+ exe "edit " . expand('<sfile>')
+ endif
endif
syn clear
diff --git a/runtime/tutor/tutor.ja.euc b/runtime/tutor/tutor.ja.euc
index 02753d7..f043e42 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: ²¿¤ò¥¿¥¤¥×¤·¤Æ¤¤¤ë¤«È½¤é¤Ê¤¯¤Ê¤Ã¤¿¤é¡¢<ESC>¤ò²¡¤·¤Æ¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ë¤·¤Þ
- ¤¹¡£¤½¤ì¤«¤éÆþÎϤ·¤è¤¦¤È¤·¤Æ¤¤¤¿¥³¥Þ¥ó¥É¤òºÆÆþÎϤ·¤Þ¤·¤ç¤¦¡£
+Note: ²¿¤ò¥¿¥¤¥×¤·¤Æ¤¤¤ë¤«È½¤é¤Ê¤¯¤Ê¤Ã¤¿¤é¡¢<ESC>¤ò²¡¤·¤Æ¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ë¤·
+ ¤Þ¤¹¡£¤½¤ì¤«¤éÆþÎϤ·¤è¤¦¤È¤·¤Æ¤¤¤¿¥³¥Þ¥ó¥É¤òºÆÆþÎϤ·¤Þ¤·¤ç¤¦¡£
-NOTE: ¥«¡¼¥½¥ë¥¡¼¤Ç¤â°ÜÆ°¤Ç¤¤Þ¤¹¡£¤·¤«¤· hjkl ¤ò»ÈÍѤ¹¤ë¤³¤È¤Ë°ìÅÙ´·¤ì¤Æ¤·¤Þ
- ¤¨¤Ð¡¢¤Ï¤ë¤«¤Ë®¤¯°ÜÆ°¤¹¤ë¤³¤È¤¬¤Ç¤¤ë¤Ç¤·¤ç¤¦¡£
+Note: ¥«¡¼¥½¥ë¥¡¼¤Ç¤â°ÜÆ°¤Ç¤¤Þ¤¹¡£¤·¤«¤· hjkl ¤Ë°ìÅÙ´·¤ì¤Æ¤·¤Þ¤¨¤Ð¡¢¤Ï¤ë¤«
+ ¤Ë®¤¯°ÜÆ°¤¹¤ë¤³¤È¤¬¤Ç¤¤ë¤Ç¤·¤ç¤¦¡£¤¤¤ä¥Þ¥¸¤Ç!
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
¥ì¥Ã¥¹¥ó 1.2: VIM ¤Îµ¯Æ°¤È½ªÎ»
@@ -52,27 +53,27 @@
1. <ESC>¥¡¼¤ò²¡¤·¤Þ¤·¤ç¤¦¡£(³Î¼Â¤Ë¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ë¤¹¤ë¤¿¤á)
2. ¼¡¤Î¤è¤¦¤Ë¥¿¥¤¥×: :q! <ENTER>
+ ¤³¤ì¤Ë¤è¤êÊÔ½¸¤·¤¿ÆâÍƤòÊݸ¤»¤º¤Ë¥¨¥Ç¥£¥¿¤¬½ªÎ»¤·¤Þ¤¹¡£
----> ¤³¤ì¤Ë¤è¤êÊÔ½¸¤·¤¿ÆâÍƤòÊݸ¤»¤º¤Ë¥¨¥Ç¥£¥¿¤¬½ªÎ»¤·¤Þ¤¹¡£
- ÊÔ½¸ÆâÍƤòÊݸ¤·¤Æ½ªÎ»¤¹¤ë¤È¤¤Ï¼¡¤Î¤è¤¦¤Ë¥¿¥¤¥×¤·¤Þ¤¹:
- :wq <ENTER>
-
- 3. ¥·¥§¥ë¥×¥í¥ó¥×¥È¤«¤é¥Á¥å¡¼¥È¥ê¥¢¥ë¤ò»Ï¤á¤ë¤Ë¤Ï¥³¥Þ¥ó¥É¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£
+ 3. ¥·¥§¥ë¥×¥í¥ó¥×¥È¤¬½Ð¤Æ¤¤¿¤é¡¢¤³¤Î¥Á¥å¡¼¥È¥ê¥¢¥ë¤ò»Ï¤á¤ë°Ù¤Ë¤Ë¥³¥Þ¥ó¥É
+ ¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£
¤½¤Î¥³¥Þ¥ó¥É¤Ï: vimtutor <ENTER>
- Ä̾ï¤Ï¤³¤¦¤Ç¤·¤ç¤¦: vim tutor <ENTER>
-
----> 'vim' ¤Ï Vim ¥¨¥Ç¥£¥¿¤Îµ¯Æ°¤ò¡¢'tutor' ¤ÏÊÔ½¸¤·¤¿¤¤¥Õ¥¡¥¤¥ë¤ò°ÕÌ£¤·¤Þ¤¹¡£
4. ¤³¤ì¤Þ¤Ç¤Î¥¹¥Æ¥Ã¥×¤ò³Ð¤¨¼«¿®¤¬¤Ä¤¤¤¿¤Ê¤é¤Ð¡¢¥¹¥Æ¥Ã¥× 1 ¤«¤é 3 ¤Þ¤Ç¤ò¼Â
- ºÝ¤Ë»î¤·¤Æ¡¢Vim ¤ò1ÅÙ½ªÎ»¤·¤Æ¤«¤éºÆ¤Óµ¯Æ°¤·¤Þ¤·¤ç¤¦¡£¤½¤ì¤«¤é¥ì¥Ã¥¹¥ó
- 1.3¤Þ¤Ç¥«¡¼¥½¥ë¤ò°ÜÆ°¤µ¤»¤Þ¤·¤ç¤¦¡£
+ ºÝ¤Ë»î¤·¤Æ¡¢Vim ¤ò1ÅÙ½ªÎ»¤·¤Æ¤«¤éºÆ¤Óµ¯Æ°¤·¤Þ¤·¤ç¤¦¡£
+
+NOTE: :q! <ENTER> ¤ÏÁ´¤Æ¤ÎÊѹ¹¤òÇË´þ¤·¤Þ¤¹¡£¥ì¥Ã¥¹¥ó¤Ë¤ÆÊѹ¹¤ò¥Õ¥¡¥¤¥ë¤ËÊÝ
+ ¸¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤âÊÙ¶¯¤·¤Æ¤¤¤¤Þ¤·¤ç¤¦¡£
+
+ 5. 1.3¤Þ¤Ç¥«¡¼¥½¥ë¤ò°ÜÆ°¤µ¤»¤Þ¤·¤ç¤¦¡£
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
¥ì¥Ã¥¹¥ó 1.3: ¥Æ¥¥¹¥ÈÊÔ½¸ - ºï½ü
** ¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ë¤Æ¥«¡¼¥½¥ë¤Î²¼¤Îʸ»ú¤òºï½ü¤¹¤ë¤Ë¤Ï x ¤ò²¡¤·¤Þ¤¹ **
- 1. °Ê²¼¤Î ---> ¤Èµ¤µ¤ì¤¿¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
+ 1. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
2. ´Ö°ã¤¤¤ò½¤Àµ¤¹¤ë¤¿¤á¤Ë¡¢ºï½ü¤¹¤ëºÇ½é¤Îʸ»ú¤Þ¤Ç¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤¹¡£
@@ -82,7 +83,7 @@
---> ¤½¤Î ¤¦¤¦¤µ¤® ¤Ï ¤Ä¤Ä¤¤ ¤ò ¤³¤¨¤¨¤Æ¤Æ ¤È¤Ó¤Ï¤Í¤¿¤¿
- 5. ¹Ô¤¬Àµ¤·¤¯¤Ê¤Ã¤¿¤é¡¢¥ì¥Ã¥¹¥ó 1.4 ¤Ë°Ü¤ê¤Þ¤·¤ç¤¦¡£
+ 5. ¹Ô¤¬Àµ¤·¤¯¤Ê¤Ã¤¿¤é¡¢¥ì¥Ã¥¹¥ó 1.4 ¤Ø¿Ê¤ß¤Þ¤·¤ç¤¦¡£
NOTE: Á´¤Æ¤Î¥ì¥Ã¥¹¥ó¤òÄ̤¸¤Æ¡¢³Ð¤¨¤è¤¦¤È¤¹¤ë¤Î¤Ç¤Ï¤Ê¤¯¼ÂºÝ¤Ë¤ä¤Ã¤Æ¤ß¤Þ¤·¤ç¤¦¡£
@@ -95,15 +96,15 @@
** ¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ë¤Æ¥Æ¥¥¹¥È¤òÁÞÆþ¤¹¤ë¤Ë¤Ï i ¤ò²¡¤·¤Þ¤¹ **
- 1. °Ê²¼¤Î ---> ¤Èµ¤µ¤ì¤¿¤µ¤ì¤¿ºÇ½é¤Î¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
+ 1. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿ºÇ½é¤Î¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
- 2. 1¹ÔÌܤò2¹ÔÌܤÈƱ¤¸Íͤˤ¹¤ë¤¿¤á¤Ë¡¢¥Æ¥¥¹¥È¤òÁÞÆþ¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤°Ì
- Ã֤μ¡¤Îʸ»ú¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤¹¡£
+ 2. 1¹ÔÌܤò2¹ÔÌܤÈƱ¤¸Íͤˤ¹¤ë¤¿¤á¤Ë¡¢¥Æ¥¥¹¥È¤òÁÞÆþ¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤°ÌÃÖ
+ ¤Î¼¡¤Îʸ»ú¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤¹¡£
3. i ¥¡¼¤ò²¡¤·¤Æ¤«¤é¡¢Äɲä¬É¬ÍפÊʸ»ú¤ò¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£
- 4. ´Ö°ã¤¤¤ò½¤Àµ¤·¤¿¤é <ESC> ¤ò²¡¤·¤Æ¥³¥Þ¥ó¥É¥â¡¼¥É¤ËÌá¤ê¡¢Àµ¤·¤¤Ê¸¤Ë
- ¤Ê¤ëÍͤ˥¹¥Æ¥Ã¥× 2 ¤«¤é 4 ¤ò·«¤êÊÖ¤·¤Þ¤·¤ç¤¦¡£
+ 4. ´Ö°ã¤¤¤ò½¤Àµ¤·¤¿¤é <ESC> ¤ò²¡¤·¤Æ¥³¥Þ¥ó¥É¥â¡¼¥É¤ËÌá¤ê¡¢Àµ¤·¤¤Ê¸¤Ë¤Ê¤ëÍÍ
+ ¤Ë¥¹¥Æ¥Ã¥× 2 ¤«¤é 4 ¤ò·«¤êÊÖ¤·¤Þ¤·¤ç¤¦¡£
---> ¤³¤Î ¤Ë¤Ï ¤ê¤Ê¤¤ ¥Æ¥¥¹¥È ¤¢¤ë¡£
---> ¤³¤Î ¹Ô ¤Ë¤Ï ´ö¤Ä¤« ¤ê¤Ê¤¤ ¥Æ¥¥¹¥È ¤¬ ¤¢¤ë¡£
@@ -113,6 +114,52 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ¥ì¥Ã¥¹¥ó 1.5: ¥Æ¥¥¹¥ÈÊÔ½¸ - ÄɲÃ
+
+
+ ** ¥Æ¥¥¹¥ÈÄɲ乤ë¤Ë¤Ï A ¤ò²¡¤·¤Þ¤·¤ç¤¦ **
+
+ 1. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿ºÇ½é¤Î¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
+ ¥«¡¼¥½¥ë¤¬¤½¤Îʸ»ú¾å¤Ë¤¢¤Ã¤Æ¤â¤«¤Þ¤¤¤Þ¤»¤ó¡£
+
+ 2. Äɲä¬É¬Íפʾì½ê¤Ç A ¤ò¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£
+
+ 3. ¥Æ¥¥¹¥È¤òÄɲä·½ª¤¨¤¿¤é¡¢ <ESC> ¤ò²¡¤·¤Æ¥Î¡¼¥Þ¥ë¥â¡¼¥É¤ËÌá¤ê¤Þ¤·¤ç¤¦¡£
+
+ 4. 2¹ÔÌܤΠ---> ¤È¼¨¤µ¤ì¤¿¾ì½ê¤Ø°ÜÆ°¤·¡¢¥¹¥Æ¥Ã¥× 2 ¤«¤é 3 ·«¤êÊÖ¤·¤Æʸˡ¤ò
+ ½¤Àµ¤·¤Þ¤·¤ç¤¦¡£
+
+---> ¤³¤³¤Ë¤Ï´Ö°ã¤Ã¤¿¥Æ¥¥¹¥È¤¬¤¢¤ê
+ ¤³¤³¤Ë¤Ï´Ö°ã¤Ã¤¿¥Æ¥¥¹¥È¤¬¤¢¤ê¤Þ¤¹¡£
+---> ¤³¤³¤Ë¤â´Ö°ã¤Ã¤¿¥Æ¥¥¹
+ ¤³¤³¤Ë¤â´Ö°ã¤Ã¤¿¥Æ¥¥¹¥È¤¬¤¢¤ê¤Þ¤¹¡£
+
+ 5. ¥Æ¥¥¹¥È¤ÎÄɲ䬷ڲ÷¤Ë¤Ê¤Ã¤Æ¤¤¿¤é¥ì¥Ã¥¹¥ó 1.6 ¤Ø¿Ê¤ß¤Þ¤·¤ç¤¦¡£
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ¥ì¥Ã¥¹¥ó 1.6: ¥Õ¥¡¥¤¥ë¤ÎÊÔ½¸
+
+
+ ** ¥Õ¥¡¥¤¥ë¤òÊݸ¤·¤Æ½ªÎ»¤¹¤ë¤Ë¤Ï :wq ¤È¥¿¥¤¥×¤·¤Þ¤¹ **
+
+ !! NOTE: °Ê²¼¤Î¥¹¥Æ¥Ã¥×¤ò¼Â¹Ô¤¹¤ëÁ°¤Ë¡¢¤Þ¤ºÁ´ÂΤòÆɤó¤Ç¤¯¤À¤µ¤¤!!
+
+ 1. ¥ì¥Ã¥¹¥ó 1.2 ¤Ç¤ä¤Ã¤¿¤è¤¦¤Ë :q! ¤ò¥¿¥¤¥×¤·¤Æ¡¢¤³¤Î¥Á¥å¡¼¥È¥ê¥¢¥ë¤ò½ªÎ»
+ ¤·¤Þ¤¹¡£
+
+ 2. ¥·¥§¥ë¥×¥í¥ó¥×¥È¤Ç¤³¤Î¥³¥Þ¥ó¥É¤ò¥¿¥¤¥×¤·¤Þ¤¹: vim tutor <ENTER>
+ 'vim'¤¬ Vim ¥¨¥Ç¥£¥¿¤òµ¯Æ°¤¹¤ë¥³¥Þ¥ó¥É¡¢'tutor' ¤ÏÊÔ½¸¤·¤¿¤¤¥Õ¥¡¥¤¥ë¤Î
+ ̾Á°¤Ç¤¹¡£Êѹ¹¤·¤Æ¤â¤è¤¤¥Õ¥¡¥¤¥ë¤ò»È¤¤¤Þ¤·¤ç¤¦¡£
+
+ 3. Á°¤Î¥ì¥Ã¥¹¥ó¤Ç³Ø¤ó¤À¤è¤¦¤Ë¡¢¥Æ¥¥¹¥È¤òÁÞÆþ¡¢ºï½ü¤·¤Þ¤¹¡£
+
+ 4. Êѹ¹¤ò¥Õ¥¡¥¤¥ë¤ËÊݸ¤·¤Þ¤¹: :wq <ENTER>
+
+ 5. vimtutor ¤òºÆÅÙµ¯Æ°¤·¡¢°Ê²¼¤ÎÍ×Ìó¤Ø¿Ê¤ß¤Þ¤·¤ç¤¦¡£
+
+ 6. °Ê¾å¤Î¥¹¥Æ¥Ã¥×¤òÆɤó¤ÇÍý²ò¤·¤¿¾å¤Ç¤³¤ì¤ò¼Â¹Ô¤·¤Þ¤·¤ç¤¦¡£
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
¥ì¥Ã¥¹¥ó 1 Í×Ìó
@@ -127,14 +174,14 @@
4. ¥«¡¼¥½¥ë¤Î²¼¤Îʸ»ú¤òºï½ü¤¹¤ë¤Ë¤Ï¡¢¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ç x ¤È¥¿¥¤¥×¤·¤Þ¤¹¡£
5. ¥«¡¼¥½¥ë¤Î°ÌÃÖ¤Ëʸ»ú¤òÁÞÆþ¤¹¤ë¤Ë¤Ï¡¢¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ç i ¤È¥¿¥¤¥×¤·¤Þ¤¹¡£
- i ¥Æ¥¥¹¥È¤Î¥¿¥¤¥× <ESC>
+ i ¥Æ¥¥¹¥È¤Î¥¿¥¤¥× <ESC> ¥«¡¼¥½¥ë°ÌÃÖ¤ËÄɲÃ
+ A ¥Æ¥¥¹¥È¤ÎÄɲà <ESC> ¹ÔËö¤ËÄɲÃ
-NOTE: <ESC> ¥¡¼¤ò²¡¤¹¤È¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ë°Ü¹Ô¤·¤Þ¤¹¡£¤½¤ÎºÝ¡¢´Ö°ã¤Ã¤¿¤êÆþÎÏÅÓÃæ
- ¤Î¥³¥Þ¥ó¥É¤ò¼è¤ê¾Ã¤¹¤³¤È¤¬¤Ç¤¤Þ¤¹¡£
+NOTE: <ESC> ¥¡¼¤ò²¡¤¹¤È¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ë°Ü¹Ô¤·¤Þ¤¹¡£¤½¤ÎºÝ¡¢´Ö°ã¤Ã¤¿¤êÆþÎÏÅÓ
+ Ãæ¤Î¥³¥Þ¥ó¥É¤ò¼è¤ê¾Ã¤¹¤³¤È¤¬¤Ç¤¤Þ¤¹¡£
¤µ¤Æ¡¢Â³¤±¤Æ¥ì¥Ã¥¹¥ó 2 ¤ò»Ï¤á¤Þ¤·¤ç¤¦¡£
-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
¥ì¥Ã¥¹¥ó 2.1: ºï½ü¥³¥Þ¥ó¥É
@@ -143,7 +190,7 @@
1. ¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ç¤¢¤ë¤³¤È¤ò³Îǧ¤¹¤ë¤¿¤á¤Ë <ESC> ¤ò²¡¤·¤Þ¤·¤ç¤¦¡£
- 2. °Ê²¼¤Î ---> ¤Èµ¤µ¤ì¤¿¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
+ 2. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
3. ¾Ã¤·¤¿¤¤Ã±¸ì¤ÎÀèƬ¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
@@ -154,7 +201,7 @@
---> ¤³¤Î ʸ »æ ¤Ë¤Ï ¤¤¤¯¤Ä¤«¤Î ¤¿¤Î¤·¤¤ ɬÍפΤʤ¤ ñ¸ì ¤¬ ´Þ¤Þ¤ì¤Æ ¤¤¤Þ¤¹¡£
- 5. 3 ¤«¤é 4 ¤Þ¤Ç¤òʸ¤¬Àµ¤·¤¯¤Ê¤ë¤Þ¤Ç·«¤êÊÖ¤·¡¢¥ì¥Ã¥¹¥ó 2.2 ¤Ë°Ü¤ê¤Þ¤·¤ç¤¦¡£
+ 5. 3 ¤«¤é 4 ¤Þ¤Ç¤òʸ¤¬Àµ¤·¤¯¤Ê¤ë¤Þ¤Ç·«¤êÊÖ¤·¡¢¥ì¥Ã¥¹¥ó 2.2 ¤Ø¿Ê¤ß¤Þ¤·¤ç¤¦¡£
@@ -166,7 +213,7 @@
1. ¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ç¤¢¤ë¤³¤È¤ò³Îǧ¤¹¤ë¤Î¤Ë <ESC> ¤ò²¡¤·¤Þ¤·¤ç¤¦¡£
- 2. °Ê²¼¤Î ---> ¤Èµ¤µ¤ì¤¿¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
+ 2. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
3. Àµ¤·¤¤Ê¸¤ÎËöÈø¤Ø¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦(ºÇ½é¤Î . ¤Î¸å¤Ç¤¹)¡£
@@ -175,77 +222,123 @@
---> 狼¤¬¤³¤Î¹Ô¤ÎºÇ¸å¤ò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: ¤è¤ê¿¤¯¤òºï½ü¤¹¤ë¤¿¤á¤Ë¥«¥¦¥ó¥È¤ò»ÈÍѤ¹¤ë
- ** ¹ÔÁ´ÂΤòºï½ü¤¹¤ë¤Ë¤Ï dd ¤È¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦ **
+ ** ¥ª¥Ú¥ì¡¼¥¿¤È¥«¥¦¥ó¥È¤ò¥¿¥¤¥×¤¹¤ë¤È¡¢¤½¤ÎÁàºî¤¬Ê£¿ô²ó·«¤êÊÖ¤µ¤ì¤Þ¤¹¡£ **
- ¹ÔÁ´ÂΤκï½ü¤ÏÉÑÈˤ˹Ԥʤ¦ºî¶È¤Ê¤Î¤Ç¡¢Vim ¤ÎÀ߷׼ԤϹԤòºï½ü¤¹¤ë¤Î¤Ë¤Ï¡¢
- ñ¤ËÎóÆâ¤Ë¤Æ2²ó d ¤ò¥¿¥¤¥×¤¹¤ëÊý¤¬´Êñ¤À¤í¤¦¤ÈȽÃǤ·¤Þ¤·¤¿¡£
+ ´û½Ò¤Îºï½ü¤Î¥ª¥Ú¥ì¡¼¥¿¤È¥â¡¼¥·¥ç¥ó¤ÎÁȤ߹ç¤ï¤»¤Ë¥«¥¦¥ó¥È¤òÄɲ乤뤳¤È¤Ç¡¢
+ ¤è¤ê¿¤¯¤Îºï½ü¤¬¹Ô¤¨¤Þ¤¹:
+ d ¿ôÃÍ ¥â¡¼¥·¥ç¥ó
- 1. ²¼¤Ë¤¢¤ë°ìÏ¢¤Î¥Õ¥ì¡¼¥º¤Î2¹ÔÌܤ˥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
- 2. dd ¤È¥¿¥¤¥×¤·¤Æ¹Ô¤òºï½ü¤·¤Þ¤·¤ç¤¦¡£
- 3. ¤Ç¤Ï4¹ÔÌܤ˰ÜÆ°¤·¤Æ¤ß¤Þ¤·¤ç¤¦¡£
- 4. 2dd ¤È¥¿¥¤¥×¤·¤Æ2¹Ôºï½ü¤·¤Æ¤ß¤Þ¤·¤ç¤¦¡£
- (²ó¿ô-¥³¥Þ¥ó¥É-ÌÜŪ¸ì ¤Î·Á¼°¤ò»×¤¤½Ð¤·¤Þ¤·¤ç¤¦)
+ 1. ---> ¤È¼¨¤µ¤ì¤¿¹Ô¤Î¹ÔƬÉôʬ¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
- 1) ¥Ð¥é¤ÏÀÖ¤¤¡¢
- 2) ¤Ä¤Þ¤é¤Ê¤¤¤â¤Î¤Ï³Ú¤·¤¤¡¢
- 3) ¥¹¥ß¥ì¤ÏÀĤ¤¡¢
- 4) »ä¤Ï¼Ö¤ò¤â¤Ã¤Æ¤¤¤ë¡¢
- 5) »þ·×¤¬»þ¹ï¤ò¹ð¤²¤ë¡¢
- 6) º½Åü¤Ï´Å¤¤
- 7) ¥ª¥Þ¥¨¥â¥Ê¡¼
+ 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.5: ¤ä¤êľ¤·¥³¥Þ¥ó¥É
+ ¥ì¥Ã¥¹¥ó 2.6: ¹Ô¤ÎÁàºî
+
+
+ ** ¹ÔÁ´ÂΤòºï½ü¤¹¤ë¤Ë¤Ï dd ¤È¥¿¥¤¥×¤·¤Þ¤¹ **
+
+ ¹ÔÁ´ÂΤòºï½ü¤¹¤ëÉÑÅÙ¤¬Â¿¤¤¤Î¤Ç¡¢Vi¤Î¥Ç¥¶¥¤¥Ê¡¼¤Ï¹Ô¤Îºï½ü¤ò d ¤Î2²ó¥¿¥¤¥×¤È
+ ¤¤¤¦´Êñ¤Ê¤â¤Î¤Ë·è¤á¤Þ¤·¤¿¡£
+
+ 1. °Ê²¼¤Î¶ç¤Î2¹ÔÌܤ˥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤¹¡£
+ 2. dd ¤È¥¿¥¤¥×¤·¤Æ¹Ô¤òºï½ü¤·¤Þ¤¹¡£
+ 3. ¤µ¤é¤Ë4¹ÔÌܤ˰ÜÆ°¤·¤Þ¤¹¡£
+ 4. 2dd ¤È¥¿¥¤¥×¤·¤Æ2¹Ô¤òºï½ü¤·¤Þ¤¹¡£
+
+---> 1) ¥Ð¥é¤ÏÀÖ¤¤¡¢
+---> 2) ¤Ä¤Þ¤é¤Ê¤¤¤â¤Î¤Ï³Ú¤·¤¤¡¢
+---> 3) ¥¹¥ß¥ì¤ÏÀĤ¤¡¢
+---> 4) »ä¤Ï¼Ö¤ò¤â¤Ã¤Æ¤¤¤ë¡¢
+---> 5) »þ·×¤¬»þ¹ï¤ò¹ð¤²¤ë¡¢
+---> 6) º½Åü¤Ï´Å¤¤
+---> 7) ¥ª¥Þ¥¨¥â¥Ê¡¼
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ¥ì¥Ã¥¹¥ó 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 @@
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 @@
** ¥«¡¼¥½¥ë¤Î²¼¤Îʸ»ú¤òÃÖ¤´¹¤¨¤ë¤Ë¤Ï r ¤ò¥¿¥¤¥×¤·¤Þ¤¹ **
- 1. °Ê²¼¤Î ---> ¤Èµ¤µ¤ì¤¿¤µ¤ì¤¿ºÇ½é¤Î¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
+ 1. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿ºÇ½é¤Î¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
2. ºÇ½é¤Î´Ö°ã¤¤¤ÎÀèƬ¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
@@ -313,7 +406,7 @@
---> ¤³¤Î¹ç¤ò¿ÍÎϤ·¤¿»þ¤Í¡¢¤½¤Î¿Í¤Ï´ö¤Ä¤«Ìä°ã¤Ã¤¿¥¡¼¤ò²¡¤·¤â¤·¤¿!
---> ¤³¤Î¹Ô¤òÆþÎϤ·¤¿»þ¤Ë¡¢¤½¤Î¿Í¤Ï´ö¤Ä¤«´Ö°ã¤Ã¤¿¥¡¼¤ò²¡¤·¤Þ¤·¤¿!
- 5. ¤µ¤¡¡¢¥ì¥Ã¥¹¥ó 3.2 ¤Ë°Ü¤ê¤Þ¤·¤ç¤¦¡£
+ 5. ¤µ¤¡¡¢¥ì¥Ã¥¹¥ó 3.2 ¤Ø¿Ê¤ß¤Þ¤·¤ç¤¦¡£
NOTE: ¼ÂºÝ¤Ë»î¤·¤Þ¤·¤ç¤¦¡£·è¤·¤Æ³Ð¤¨¤ë¤À¤±¤Ë¤Ï¤·¤Ê¤¤¤³¤È¡£
@@ -325,7 +418,7 @@
** ñ¸ì¤Î°ìÉô¡¢¤â¤·¤¯¤ÏÁ´ÂΤòÊѹ¹¤¹¤ë¤Ë¤Ï cw ¤È¥¿¥¤¥×¤·¤Þ¤¹ **
- 1. °Ê²¼¤Î ---> ¤Èµ¤µ¤ì¤¿¤µ¤ì¤¿ºÇ½é¤Î¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
+ 1. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿ºÇ½é¤Î¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
2. lubw ¤Î u ¤Î°ÌÃ֤˥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
@@ -348,14 +441,13 @@
** Êѹ¹¥³¥Þ¥ó¥É¤Ï¡¢ºï½ü¥³¥Þ¥ó¥É¤ÈƱ¤¸Íͤ˥ª¥Ö¥¸¥§¥¯¥È¤ò»ÈÍѤ·¤Þ¤¹ **
-
1. Êѹ¹¥³¥Þ¥ó¥É¤Ï¡¢ºï½ü¥³¥Þ¥ó¥É¤ÈƱ¤¸¤è¤¦¤ÊÆ°ºî¤ò¤·¤Þ¤¹¡£¤½¤Î·Á¼°¤Ï
- [²ó¿ô] c ÌÜŪ¸ì ¤â¤·¤¯¤Ï c [²ó¿ô] ÌÜŪ¸ì
+ c [¿ôÃÍ] ¥â¡¼¥·¥ç¥ó
2. ¥ª¥Ö¥¸¥§¥¯¥È¤âƱ¤¸¤Ç¡¢w ¤Ïñ¸ì¡¢ $ ¤Ï¹ÔËö¤Ê¤É¤È¤¤¤Ã¤¿¤â¤Î¤Ç¤¹¡£
- 3. °Ê²¼¤Î ---> ¤Èµ¤µ¤ì¤¿¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
+ 3. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
4. ºÇ½é¤Î´Ö°ã¤¤¤Ø¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
@@ -364,6 +456,7 @@
---> 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,63 +469,63 @@
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 ¤Î¤¿¤á¤Ë¹ÔÈÖ¹æ¤ò
- ³Ð¤¨¤Æ¤ª¤¤Þ¤·¤ç¤¦¡£(Ìõ¼ÔÃí:¥ë¡¼¥é¡¼¤¬¤¢¤ë¾ì¹ç¤Ï¤½¤Á¤é¤ËÃíÌÜ)
+ 1. CTRL ¤ò²¡¤·¤¿¤Þ¤Þ g ¤ò²¡¤·¤Þ¤·¤ç¤¦¡£¤³¤ÎÁàºî¤ò CTRL-G ¤È¸Æ¤ó¤Ç¤¤¤Þ¤¹¡£
+ ¥Ú¡¼¥¸¤Î°ìÈÖ²¼¤Ë¥Õ¥¡¥¤¥ë̾¤È¹ÔÈֹ椬ɽ¼¨¤µ¤ì¤ë¤Ï¤º¤Ç¤¹¡£ ¥¹¥Æ¥Ã¥× 3¤Î¤¿¤á
+ ¤Ë¹ÔÈÖ¹æ¤ò³Ð¤¨¤Æ¤ª¤¤Þ¤·¤ç¤¦¡£
- 2. ºÇ²¼¹Ô¤Ë°ÜÆ°¤¹¤ë¤¿¤á¤Ë shift-G ¤È¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£
+NOTE: ²èÌ̤ᦲ¼¶ù¤Ë¥«¡¼¥½¥ë¤Î°ÌÃÖ¤¬É½¼¨¤µ¤ì¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¤³¤ì¤Ï
+ 'ruler' ¥ª¥×¥·¥ç¥ó(¥ì¥Ã¥¹¥ó6¤ÇÀâÌÀ)¤òÀßÄꤹ¤ë¤³¤È¤Çɽ¼¨¤µ¤ì¤Þ¤¹¡£
- 3. Àè¤Û¤É¤Î¹Ô¤ÎÈÖ¹æ¤ò¥¿¥¤¥×¤·¡¢ shift-G ¤ò¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£
- ºÇ½é¤Ë Ctrl-g ¤ò²¡¤·¤¿¹Ô¤ËÌá¤Ã¤ÆÍè¤ë¤Ï¤º¤Ç¤¹¡£
- (¿ô»ú¤ò¥¿¥¤¥×¤·¤Æ¤¤¤ë¤È¤¤Ë¤Ï²èÌ̤Ëɽ¼¨¤µ¤ì¤Þ¤»¤ó)
+ 2. ºÇ²¼¹Ô¤Ë°ÜÆ°¤¹¤ë¤¿¤á¤Ë G ¤ò¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£
+ ¥Õ¥¡¥¤¥ë¤ÎÀèƬ¤Ë°ÜÆ°¤¹¤ë¤Ë¤Ï gg ¤È¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£
+
+ 3. Àè¤Û¤É¤Î¹Ô¤ÎÈÖ¹æ¤ò¥¿¥¤¥×¤· G ¤ò¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£ºÇ½é¤Ë CTRL-G ¤ò²¡¤·¤¿¹Ô
+ ¤ËÌá¤Ã¤ÆÍè¤ë¤Ï¤º¤Ç¤¹¡£
4. ¼«¿®¤¬»ý¤Æ¤¿¤é¥¹¥Æ¥Ã¥× 1 ¤«¤é 3 ¤ò¼Â¹Ô¤·¤Þ¤·¤ç¤¦¡£
-
-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
¥ì¥Ã¥¹¥ó 4.2: ¸¡º÷¥³¥Þ¥ó¥É
** ¸ì¶ç¤ò¸¡º÷¤¹¤ë¤Ë¤Ï / ¤È¡¢Á°Êý¸¡º÷¤¹¤ë¸ì¶ç¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£**
- 1. ¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ç / ¤È¤¤¤¦Ê¸»ú¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£²èÌÌ°ìÈÖ²¼¤Ë : ¥³¥Þ¥ó¥É
- ¤ÈƱ¤¸ÍÍ¤Ë / ¤¬¸½¤ì¤ë¤³¤È¤Ëµ¤¤Å¤¯¤Ç¤·¤ç¤¦¡£
+ 1. ¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ç / ¤È¤¤¤¦Ê¸»ú¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£²èÌÌ°ìÈÖ²¼¤Ë : ¥³¥Þ¥ó¥É¤È
+ Ʊ¤¸ÍÍ¤Ë / ¤¬¸½¤ì¤ë¤³¤È¤Ëµ¤¤Å¤¯¤Ç¤·¤ç¤¦¡£
2. ¤Ç¤Ï¡¢'errroor' <ENTER> ¤È¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£¤³¤ì¤¬¸¡º÷¤·¤¿¤¤Ã±¸ì¤Ç¤¹¡£
3. Ʊ¤¸¸ì¤ò¤â¤¦°ìÅÙ¸¡º÷¤¹¤ë¤È¤¤Ï ñ¤Ë n ¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£
µÕÊý¸þ¤Ë¸ì¶ç¤ò¸¡º÷¤¹¤ë¤È¤¤Ï N ¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£
- 4. µÕÊý¸þ¤Ë¸ì¶ç¤ò¸¡º÷¤·¤¿¤¤¾ì¹ç¤Ï¡¢/ ¥³¥Þ¥ó¥É¤Î¤«¤ï¤ê¤Ë ? ¥³¥Þ¥ó¥É¤ò»ÈÍѤ·
- ¤Þ¤¹¡£
+ 4. µÕÊý¸þ¤Ë¸ì¶ç¤ò¸¡º÷¤¹¤ë¾ì¹ç¤Ï¡¢/ ¤ÎÂå¤ï¤ê¤Ë ? ¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Þ¤¹¡£
----> "errroor" is not the way to spell error; errroor is an error.
+ 5. ¸µ¤Î¾ì½ê¤ËÌá¤ë¤Ë¤Ï CTRL-O (Ctrl ¤ò²¡¤·Â³¤±¤Ê¤¬¤é o ʸ»ú¥¿¥¤¥×)¤ò¥¿¥¤¥×¤·
+ ¤Þ¤¹¡£¤µ¤é¤ËÌá¤ë¤Ë¤Ï¤³¤ì¤ò·«¤êÊÖ¤·¤Þ¤¹¡£CTRL-I ¤ÏÁ°Êý¸þ¤Ç¤¹¡£
-¸¡º÷¤¬¥Õ¥¡¥¤¥ë¤Î½ª¤ï¤ê¤Ë㤹¤ë¤È¡¢¥Õ¥¡¥¤¥ë¤ÎÀèƬ¤«¤é¸¡º÷¤ò³¹Ô¤·¤Þ¤¹¡£
-
-
+Note: "errroor" ¤Ï error ¤È¥¹¥Ú¥ë¤¬°ã¤¤¤Þ¤¹; errroor ¤Ï¤¤¤ï¤æ¤ë error ¤Ç¤¹¡£
+Note: ¸¡º÷¤¬¥Õ¥¡¥¤¥ë¤Î½ª¤ï¤ê¤Ë㤹¤ë¤È¡¢¥ª¥×¥·¥ç¥ó 'wrapscan' ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë
+ ¾ì¹ç¤Ï¡¢¥Õ¥¡¥¤¥ë¤ÎÀèƬ¤«¤é¸¡º÷¤ò³¹Ô¤·¤Þ¤¹¡£
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
¥ì¥Ã¥¹¥ó 4.3: Âбþ¤¹¤ë³ç¸Ì¤ò¸¡º÷
@@ -440,8 +533,7 @@
** Âбþ¤¹¤ë ),] ¤ä } ¤ò¸¡º÷¤¹¤ë¤Ë¤Ï % ¤ò¥¿¥¤¥×¤·¤Þ¤¹ **
- 1. °Ê²¼¤Î ---> ¤Èµ¤µ¤ì¤¿¤µ¤ì¤¿¹Ô¤Ç (,[ ¤« { ¤Î¤É¤ì¤«¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°
- ¤·¤Þ¤·¤ç¤¦¡£
+ 1. ²¼¤Î ---> ¤Ç¼¨¤µ¤ì¤¿¹Ô¤Ç (,[ ¤« { ¤Î¤É¤ì¤«¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
2. ¤½¤³¤Ç % ¤È¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£
@@ -449,21 +541,22 @@
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 <ENTER> ¤È¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£¤³¤Î¥³¥Þ¥ó¥É¤Ï¤½¤Î¹Ô¤ÇºÇ½é¤Ë¸«
¤Ä¤«¤Ã¤¿¤â¤Î¤Ë¤À¤±¹Ô¤Ê¤ï¤ì¤ë¤³¤È¤Ëµ¤¤ò¤Ä¤±¤Þ¤·¤ç¤¦¡£
@@ -474,27 +567,28 @@
---> 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 @@
¥Õ¥¡¥¤¥ë¤ÎÃæ¤ÎÁ´¤Æ¤Î¸¡º÷¸ì¶ç¤òÃÖ´¹¤¹¤ë¡£ :%s/old/new/g
'c' ¤ò²Ã¤¨¤ë¤ÈÃÖ´¹¤ÎÅ٤˳Îǧ¤òµá¤á¤ë¡£ :%s/old/new/gc
-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
¥ì¥Ã¥¹¥ó 5.1: ³°Éô¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ëÊýË¡
@@ -519,11 +612,11 @@
¥·¥§¥ë¥×¥í¥ó¥×¥È¤Î¤è¤¦¤Ë¥Ç¥£¥ì¥¯¥È¥ê¤Î°ìÍ÷¤¬É½¼¨¤µ¤ì¤ë¤Ï¤º¤Ç¤¹¡£
¤â¤·¤¯¤Ï ls ¤¬Æ°¤«¤Ê¤¤¤Ê¤é¤Ð :!dir ¤ò»ÈÍѤ·¤Þ¤·¤ç¤¦¡£
----> NOTE: ¤³¤ÎÊýË¡¤Ë¤è¤Ã¤Æ¤¢¤é¤æ¤ë¥³¥Þ¥ó¥É¤¬¼Â¹Ô¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£
+Note: ¤³¤ÎÊýË¡¤Ë¤è¤Ã¤Æ¤¢¤é¤æ¤ë¥³¥Þ¥ó¥É¤¬¼Â¹Ô¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£¤â¤Á¤í¤ó°ú¿ô
+ ¤âÍ¿¤¨¤é¤ì¤Þ¤¹¡£
----> NOTE: Á´¤Æ¤Î : ¥³¥Þ¥ó¥É¤Ï <ENTER> ¤ò²¡¤·¤Æ½ªÎ»¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-
-
+Note: Á´¤Æ¤Î : ¥³¥Þ¥ó¥É¤Ï <ENTER> ¤ò²¡¤·¤Æ½ªÎ»¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
+ °Ê¹ß¤Ç¤Ï¤³¤Î¤³¤È¤Ë¸ÀµÚ¤·¤Þ¤»¤ó¡£
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -540,37 +633,38 @@
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,22 +672,22 @@
** ¥Õ¥¡¥¤¥ë¤ÎÃæ¿È¤òÁÞÆþ¤¹¤ë¤Ë¤Ï :r ¥Õ¥¡¥¤¥ë̾ ¤È¥¿¥¤¥×¤·¤Þ¤¹ **
- 1. Àè¤Û¤É¤Î TEST ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤¹¤ë¤³¤È¤ò³Î¤«¤á¤ë¤¿¤á¤Ë :!dir ¤È
- ¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£
+ 1. ¥«¡¼¥½¥ë¤ò°Ê²¼¤Î¹Ô¤Ë¹ç¤ï¤»¤Þ¤¹¡£
- 2. ¥«¡¼¥½¥ë¤ò¤³¤Î¥Ú¡¼¥¸¤ÎÀèƬ¤Ë°ÜÆ°¤·¤Þ¤¹¡£
+NOTE: ¥¹¥Æ¥Ã¥× 2 ¤Î¼Â¹Ô¸å¡¢¥ì¥Ã¥¹¥ó 5.3 ¤Î¥Æ¥¥¹¥È¤¬¸½¤ì¤Þ¤¹¡£²¼¤Ë²¼¤¬¤Ã¤Æ¤³
+ ¤Î¥ì¥Ã¥¹¥ó¤Ë°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
-NOTE: ¥¹¥Æ¥Ã¥× 3 ¤ò¼Â¹Ô¤¹¤ë¤È¡¢²èÌÌ¤Ë ¥ì¥Ã¥¹¥ó 5.3 ¤¬¸½¤ï¤ì¤ë¤Î¤Ç¡¢¥«¡¼¥½¥ë¤ò
- ²¼¤Ë°ÜÆ°¤·¤³¤Î¥ì¥Ã¥¹¥ó¤Þ¤ÇÌá¤ê¤Þ¤·¤ç¤¦¡£
+ 2. ¤Ç¤Ï TEST ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤ò :r TEST ¤È¤¤¤¦¥³¥Þ¥ó¥É¤ÇÆɤ߹þ¤ß¤Þ¤·¤ç¤¦¡£
+ ¤³¤³¤Ç¤¤¤¦ TEST ¤Ï»È¤¦¥Õ¥¡¥¤¥ë¤Î̾Á°¤Î¤³¤È¤Ç¤¹¡£
+ Æɤ߹þ¤Þ¤ì¤¿¥Õ¥¡¥¤¥ë¤Ï¡¢¥«¡¼¥½¥ë¹Ô¤Î²¼¤Ë¤¢¤ê¤Þ¤¹¡£
- 3. ¤Ç¤Ï¡¢:r TEST ¤È¥¿¥¤¥×¤·¤Æ TEST ¥Õ¥¡¥¤¥ë¤ò¼è¹þ¤ß¤Þ¤·¤ç¤¦¡£¤³¤Î TEST ¤Ï
- ¥Õ¥¡¥¤¥ë̾¤Ç¤¹¡£
-
-NOTE: ¥Õ¥¡¥¤¥ë¤Î¼è¹þ¤ß¤Ï¥«¡¼¥½¥ë¤Î°ÌÃÖ¤«¤é¹Ô¤ï¤ì¤Þ¤¹¡£
-
- 4. ¼è¹þ¤ó¤À¥Õ¥¡¥¤¥ë¤ò³Îǧ¤·¤Æ¤ß¤Þ¤·¤ç¤¦¡£¥«¡¼¥½¥ë¤òÌ᤹¤È¡¢¥ì¥Ã¥¹¥ó5.3 ¤Î
+ 3. ¼è¹þ¤ó¤À¥Õ¥¡¥¤¥ë¤ò³Îǧ¤·¤Æ¤ß¤Þ¤·¤ç¤¦¡£¥«¡¼¥½¥ë¤òÌ᤹¤È¡¢¥ì¥Ã¥¹¥ó5.3 ¤Î
¥ª¥ê¥¸¥Ê¥ë¤È¥Õ¥¡¥¤¥ë¤Ë¤è¤ë¤â¤Î¤Î2¤Ä¤¬¤¢¤ë¤³¤È¤¬¤ï¤«¤ê¤Þ¤¹¡£
+NOTE: ³°Éô¥³¥Þ¥ó¥É¤Î½ÐÎϤòÆɤ߹þ¤à¤³¤È¤â½ÐÍè¤Þ¤¹¡£Î㤨¤Ð¡¢
+ :r !ls ¤Ï ls ¥³¥Þ¥ó¥É¤Î½ÐÎϤò¥«¡¼¥½¥ë°Ê²¼¤ËÆɤ߹þ¤ß¤Þ¤¹¡£
+
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
¥ì¥Ã¥¹¥ó 5 Í×Ìó
@@ -602,19 +696,19 @@
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 @@
** o ¤ò¥¿¥¤¥×¤¹¤ë¤È¡¢¥«¡¼¥½¥ë¤Î²¼¤Î¹Ô¤¬³«¤¡¢ÁÞÆþ¥â¡¼¥É¤ËÆþ¤ê¤Þ¤¹ **
- 1. °Ê²¼¤Î ---> ¤Èµ¤µ¤ì¤¿¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
+ 1. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
2. o (¾®Ê¸»ú) ¤ò¥¿¥¤¥×¤·¤Æ¡¢¥«¡¼¥½¥ë¤Î²¼¤Î¹Ô¤ò³«¤¡¢ÁÞÆþ¥â¡¼¥É¤ËÆþ¤ê¤Þ¤¹¡£
- 3. ---> ¤Èµ¤µ¤ì¤¿¹Ô¤ò¼Ì¤·¡¢<ESC> ¤È¥¿¥¤¥×¤·¤ÆÄɲå⡼¥É¤ò½ªÎ»¤·¤Þ¤·¤ç¤¦¡£
+ 3. ¤µ¤é¤ËÁÞÆþ¥â¡¼¥É¤ò½ªÎ»¤¹¤ë°Ù¤Ë <ESC> ¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£
---> o ¤ò¥¿¥¤¥×¤¹¤ë¤È¥«¡¼¥½¥ë¤Ï³«¤¤¤¿¹Ô¤Ø°ÜÆ°¤·ÁÞÆþ¥â¡¼¥É¤ËÆþ¤ê¤Þ¤¹¡£
4. ¥«¡¼¥½¥ë¤Î¾å¤Î¹Ô¤ËÁÞÆþ¤¹¤ë¤Ë¤Ï¡¢¾®Ê¸»ú¤Î o ¤Ç¤Ï¤Ê¤¯¡¢Ã±½ã¤ËÂçʸ»ú¤Î O
¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£¼¡¤Î¹Ô¤Ç»î¤·¤Æ¤ß¤Þ¤·¤ç¤¦¡£
-¤³¤Î¹Ô¤Î¾å¤ØÁÞÆþ¤¹¤ë¤Ë¤Ï¡¢¤³¤Î¹Ô¤Ø¥«¡¼¥½¥ë¤òÃÖ¤¤¤Æ Shift-O ¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£
+---> ¤³¤Î¹Ô¤Î¾å¤ØÁÞÆþ¤¹¤ë¤Ë¤Ï¡¢¤³¤Î¹Ô¤Ø¥«¡¼¥½¥ë¤òÃÖ¤¤¤Æ O ¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£
@@ -647,94 +741,118 @@
** ¥«¡¼¥½¥ë¤Î¼¡¤Î°ÌÃÖ¤«¤é¥Æ¥¥¹¥È¤òÄɲ乤ë¤Ë¤Ï a ¤È¥¿¥¤¥×¤·¤Þ¤¹ **
- 1. ¥Î¡¼¥Þ¥ë¥â¡¼¥É¤Ë¤·¤Æ°Ê²¼¤Î ---> ¤Èµ¤µ¤ì¤¿¤µ¤ì¤¿ºÇ½é¤Î¹Ô¤Ç $ ¤ò¥¿¥¤¥×¤·
- ¤Æ¡¢½ªÃ¼¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
+ 1. ¥«¡¼¥½¥ë¤ò ---> ¤Ç¼¨¤µ¤ì¤¿¶È¤Ø°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
- 2. ¥«¡¼¥½¥ë¤Îʸ»ú¤Î¸å¤í¤Ë¥Æ¥¥¹¥È¤òÄɲ乤뤿¤á¤Ë a (¾®Ê¸»ú) ¤ò¥¿¥¤¥×¤·¤Þ
- ¤¹¡£
+ 2. e ¤ò²¡¤·¤Æ li ¤Î½ªÃ¼Éô¤Þ¤Ç¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤¹¡£
-NOTE: ¤³¤ì¤ÏºÇ¸å¤Îʸ»ú¤Ë¤Æ¥Æ¥¥¹¥È¤òÁÞÆþ¤·¡¢<ESC> ¤ò¥¿¥¤¥×¤·¤Æ¥«¡¼¥½¥ë¤ò±¦¤Ë
- °ÜÆ°¤·¡¢ºÇ¸å¤Ë x ¥¿¥¤¥×¤·¤Æ¹ÔËö¤ËÄɲ乤ë¤È¤¤¤Ã¤¿¤è¤¦¤Ê i ¤Î¥¿¥¤¥×¤ò
- Èò¤±¤ë¤³¤È¤¬¤¤Þ¤¹¡£
+ 3. ¥«¡¼¥½¥ë¤Î¸å¤í¤Ë¥Æ¥¥¹¥È¤òÄɲ乤뤿¤á¤Ë a (¾®Ê¸»ú) ¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£
- 3. ¤µ¤ÆºÇ½é¤Î¹Ô¤ò´°À®¤·¤Þ¤·¤ç¤¦¡£¥Æ¥¥¹¥È¤¬ÁÞÆþ¤µ¤ì¤ë°ÌÃÖ¤ò½ü¤±¤Ð¡¢
- Äɲå³¥Þ¥ó¥É¤ÏÁÞÆþ¥â¡¼¥É¤È¤Þ¤Ã¤¿¤¯Æ±¤¸¤Ç¤¹¡£
+ 4. ¤½¤Î²¼¤Î¹Ô¤Î¤Î¤è¤¦¤Êñ¸ì¤Ë´°À®¤µ¤»¤Þ¤¹¡£ÁÞÆþ¥â¡¼¥É¤òÈ´¤±¤ë°Ù¤Ë <ESC> ¤Ë²¡
+ ¤·¤Þ¤¹¡£
----> ¤³¤Î¹Ô¤Ç¡¢¹ÔËö¤Ëʸ¾Ï¤òÄɲ乤ë
----> ¤³¤Î¹Ô¤Ç¡¢¹ÔËö¤Ëʸ¾Ï¤òÄɲ乤ëÎý½¬¤ò¤¹¤ë¤³¤È¤¬¤Ç¤¤ë¤Ç¤·¤ç¤¦¡£
+ 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. °Ê²¼¤Î ---> ¤Èµ¤µ¤ì¤¿¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
+ 1. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿¶È¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤¹¡£ºÇ½é¤Î xxx ¤ÎÀèƬ¤Ë°ÜÆ°¤·
+ ¤Þ¤¹¡£
- 2. ---> ¤Èµ¤µ¤ì¤¿£²¹ÔÌܤȰ㤦¡¢ºÇ½é¤Îñ¸ì¤ÎÀèƬ¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
- (ñ¸ì 'last')
+ 2. R ¤ò²¡¤·¤Æ¡¢2¹ÔÌܤοôÃͤò¥¿¥¤¥×¤¹¤ë¤³¤È¤Ç¡¢xxx ¤¬ÃÖ´¹¤µ¤ì¤Þ¤¹¡£
- 3. ¤³¤³¤Ç R ¤ò¥¿¥¤¥×¤·¤Æ¡¢ºÇ½é¤Î¹Ô¤È¼¡¤Î¹Ô¤¬Æ±¤¸¤Ë¤Ê¤ë¤è¤¦¤Ë´û¸¤Î¥Æ¥¥¹¥È
- ¤Ø¾å½ñ¤¥¿¥¤¥×¤·¡¢£±¹ÔÌܤλĤê¤ÎÉôʬ¤ò½ñ¤´¹¤¨¤Þ¤·¤ç¤¦¡£
+ 3. ÃÖ´¹¥â¡¼¥É¤òÈ´¤±¤ë¤Ë¤Ï <ESC> ¤ò²¡¤·¤Þ¤¹¡£¹Ô¤Î»Ä¤ê¤¬Êѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤¤Þ¤Þ¤Ë
+ ¤Ê¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
----> 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.
+ 5. »Ä¤Ã¤¿ xxx ¤ò¥¹¥Æ¥Ã¥×¤ò·«¤êÊÖ¤·¤ÆÃÖ´¹¤·¤Þ¤·¤ç¤¦¡£
- 4. ¥â¡¼¥É¤òÈ´¤±¤ë¤¿¤á¤Ë <ESC> ¤ò¥¿¥¤¥×¤¹¤ë¤È¡¢Êѹ¹¤·¤Æ¤¤¤Ê¤¤Éôʬ¤¬»Ä¤ë¤³¤È
- ¤ËÃí°Õ¤·¤Þ¤·¤ç¤¦¡£
+---> 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$
+
+ 5. p ¤ò²¡¤·¤ÆŽ¤êÉÕ¤±(put)¤Æ¤«¤é¡¢¼¡¤ò¥¿¥¤¥×¤·¤Þ¤¹: a second <ESC>
+
+ 6. ¥Ó¥¸¥å¥¢¥ë¥â¡¼¥É¤Ç " item." ¤òÁªÂò¤·¡¢y ¤Ç¥ä¥ó¥¯¡¢¼¡¤Î¹Ô¤Î¹ÔËö¤Þ¤Ç j$ ¤Ç
+ °ÜÆ°¤·¡¢ p ¤Ç¥Æ¥¥¹¥È¤ò¤½¤³¤Ë put ¤·¤Þ¤¹¡£
+
+---> a) this is the first item.
+ b)
+
+ Note: ñ¸ì¤ò1¤Ä yank ¤¹¤ë¤Î¤Ë y ¤ò¥ª¥Ú¥ì¡¼¥¿¤È¤·¤Æ yw ¤È¤¹¤ë¤³¤È¤â½ÐÍè¤Þ¤¹¡£
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ¥ì¥Ã¥¹¥ó 6.5: ¥ª¥×¥·¥ç¥ó¤ÎÀßÄê
- 1. °Ê²¼¤ÎÍͤ˥¿¥¤¥×¤·¤Æ 'ignore' ¤ò¸¡º÷¤·¤Þ¤·¤ç¤¦:
- /ignore
+ ** ¸¡º÷¤äÃÖ´¹¤ÎºÝ¤ËÂçʸ»ú/¾®Ê¸»ú¤ò̵»ë¤¹¤ë¤Ë¤Ï¡¢¥ª¥×¥·¥ç¥ó¤òÀßÄꤷ¤Þ¤¹ **
+
+ 1. ¼¡¤ÎÍͤËÆþÎϤ·¤Æ 'ignore' ¤ò¸¡º÷¤·¤Þ¤·¤ç¤¦: /ignore <ENTER>
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 <ENTER>
+ 6. Âçʸ»ú¾®Ê¸»ú¤Î¶èÊ̤ò̵¸ú¤Ë¤¹¤ë¤Ë¤Ï¼¡¤ÎÍͤËÆþÎϤ·¤Þ¤¹: :set noic
+
+Note: ¥Þ¥Ã¥Á¤Î¶¯Ä´É½¼¨¤ò¤ä¤á¤ë¤Ë¤Ï¼¡¤ÎÍͤËÆþÎϤ·¤Þ¤¹: :nohlsearch
+Note: 1¤Ä¤Î¸¡º÷¥³¥Þ¥ó¥É¤À¤±Âçʸ»ú¾®Ê¸»ú¤Î¶èÊ̤ò¤ä¤á¤¿¤¤¤Ê¤é¤Ð¡¢¥Õ¥ì¡¼¥º¤Ë \c
+ ¤ò»ÈÍѤ·¤Þ¤¹: /ignore\c <ENTER>
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
¥ì¥Ã¥¹¥ó 6 Í×Ìó
-
1. o ¤ò¥¿¥¤¥×¤¹¤ë¤È¥«¡¼¥½¥ë¤Î²¼¤Î¹Ô¤ò³«¤±¤Æ¡¢¤½¤³¤ÇÁÞÆþ¥â¡¼¥É¤Ë¤Ê¤ë¡£
O (Âçʸ»ú) ¤ò¥¿¥¤¥×¤¹¤ë¤È¥«¡¼¥½¥ë¤Î¾å¤Î¹Ô¤ÇÁÞÆþ¥â¡¼¥É¤Ë¤Ê¤ë¡£
2. ¥«¡¼¥½¥ë¾å¤Îʸ»ú¤Î¼¡¤«¤é¥Æ¥¥¹¥È¤òÄɲ乤ë¤Ë¤Ï a ¤È¥¿¥¤¥×¤¹¤ë¡£
¹ÔËö¤Ë¼«Æ°¤Ç¥Æ¥¥¹¥È¤òÁÞÆþ¤¹¤ë¤Ë¤ÏÂçʸ»ú A ¤ò¥¿¥¤¥×¤¹¤ë¡£
- 3. Âçʸ»ú¤Î R ¤ò¥¿¥¤¥×¤¹¤ë¤ÈÃÖ´¹¥â¡¼¥É¤ËÆþ¤ê¡¢<ESC>¤ò²¡¤¹¤ÈÈ´¤±¤ë¡£
+ 3. e ¥³¥Þ¥ó¥É¤Ïñ¸ì¤Î½ªÃ¼Éô¥«¡¼¥½¥ë¤ò°ÜÆ°¤¹¤ë¡£
- 4. ":set xxx" ¤È¥¿¥¤¥×¤¹¤ë¤È¥ª¥×¥·¥ç¥ó "xxx" ¤¬ÀßÄꤵ¤ì¤ë¡£
+ 4. y ¥ª¥Ú¥ì¡¼¥¿¤Ï¥Æ¥¥¹¥È¤ò yank (¥³¥Ô¡¼)¤·¡¢p ¤Ï¤½¤ì¤ò put (¥Ú¡¼¥¹¥È)¤¹¤ë¡£
+ 5. Âçʸ»ú¤Î R ¤ò¥¿¥¤¥×¤¹¤ë¤ÈÃÖ´¹¥â¡¼¥É¤ËÆþ¤ê¡¢<ESC>¤ò²¡¤¹¤ÈÈ´¤±¤ë¡£
+ 6. ":set xxx" ¤È¥¿¥¤¥×¤¹¤ë¤È¥ª¥×¥·¥ç¥ó "xxx" ¤¬ÀßÄꤵ¤ì¤ë¡£
+ 'ic' 'ignorecase' ¸¡º÷»þ¤ËÂçʸ»ú¾®Ê¸»ú¤Î¶èÊ̤·¤Ê¤¤
+ 'is' 'incsearch' ¸¡º÷¥Õ¥ì¡¼¥º¤ËÉôʬ¥Þ¥Ã¥Á¤·¤Æ¤¤¤ëÉôʬ¤òɽ¼¨¤¹¤ë
+ 'hls' 'hlsearch' ¥Þ¥Ã¥Á¤¹¤ë¤¹¤Ù¤ò¶¯Ä´É½¼¨¤¹¤ë
+ Ť¤Êý¡¢Ã»¤¤Êý¡¢¤É¤Á¤é¤Î¥ª¥×¥·¥ç¥ó̾¤Ç¤â»ÈÍѤǤ¤Þ¤¹¡£
-
-
-
-
-
-
+ 7. "no" ¤òÉÕÍ¿¤·¡¢¥ª¥×¥·¥ç¥ó¤ò̵¸ú¤Ë¤·¤Þ¤¹: :set noic
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ¥ì¥Ã¥¹¥ó 7: ¥ª¥ó¥é¥¤¥ó¥Ø¥ë¥×¥³¥Þ¥ó¥É
+ ¥ì¥Ã¥¹¥ó 7.1: ¥ª¥ó¥é¥¤¥ó¥Ø¥ë¥×¥³¥Þ¥ó¥É
+
** ¥ª¥ó¥é¥¤¥ó¥Ø¥ë¥×¤ò»ÈÍѤ·¤Þ¤·¤ç¤¦ **
@@ -744,20 +862,19 @@
- <F1> ¥¡¼¤ò²¡¤¹(¤â¤·¤¢¤ë¤Ê¤é¤Ð)¡£
- :help <ENTER> ¤È¥¿¥¤¥×¤¹¤ë¡£
- ¥Ø¥ë¥×¥¦¥£¥ó¥É¥¦¤òÊĤ¸¤ë¤Ë¤Ï :q <ENTER> ¤È¥¿¥¤¥×¤·¤Þ¤¹¡£
+ ¥Ø¥ë¥×¥¦¥£¥ó¥É¥¦¤Î¥Æ¥¥¹¥È¤òÆɤà¤È¡¢¥Ø¥ë¥×¤ÎÆ°ºî¤¬Íý²ò¤Ç¤¤Þ¤¹¡£
+ CTRL-W CTRL-W ¤È¥¿¥¤¥×¤¹¤ë¤È ¥Ø¥ë¥×¥¦¥£¥ó¥É¥¦¤Ø¥¸¥ã¥ó¥×¤·¤Þ¤¹¡£
+ :q <ENTER> ¤È¥¿¥¤¥×¤¹¤ë¤È ¥Ø¥ë¥×¥¦¥£¥ó¥É¥¦¤¬ÊĤ¸¤é¤ì¤Þ¤¹¡£
- ":help" ¥³¥Þ¥ó¥É¤Ë°ú¿ô¤òÍ¿¤¨¤ë¤³¤È¤Ë¤è¤ê¡¢¤¢¤é¤æ¤ëÂê̾¤Î¥Ø¥ë¥×¤ò¸«¤Ä¤±¤ë
- ¤³¤È¤¬¤Ç¤¤Þ¤¹¡£¤³¤ì¤é¤ò»î¤·¤Æ¤ß¤Þ¤·¤ç¤¦(<ENTER> ¤ò¥¿¥¤¥×¤·Ëº¤ì¤Ê¤¤¤è¤¦¤Ë):
+ ":help" ¥³¥Þ¥ó¥É¤Ë°ú¿ô¤òÍ¿¤¨¤ë¤³¤È¤Ë¤è¤ê¡¢¤¢¤é¤æ¤ëÂê̾¤Î¥Ø¥ë¥×¤ò¸«¤Ä¤±¤ë¤³¤È
+ ¤¬¤Ç¤¤Þ¤¹¡£¤³¤ì¤é¤ò»î¤·¤Æ¤ß¤Þ¤·¤ç¤¦(<ENTER> ¤ò¥¿¥¤¥×¤·Ëº¤ì¤Ê¤¤¤è¤¦¤Ë):
:help w
:help c_<T
:help insert-index
:help user-manual
-
-
-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ¥ì¥Ã¥¹¥ó 8: µ¯Æ°¥¹¥¯¥ê¥×¥È¤ÎºîÀ®
+ ¥ì¥Ã¥¹¥ó 7.2: µ¯Æ°¥¹¥¯¥ê¥×¥È¤ÎºîÀ®
** Vim ¤ÎÆÃħ¤òȯ´ø¤¹¤ë **
@@ -770,15 +887,61 @@
:edit $VIM/_vimrc MS-Windows ¸þ¤±
2. ¤³¤³¤Ç¥µ¥ó¥×¥ë¤Î "vimrc" ¤òÆɤ߹þ¤ß¤Þ¤¹¡£
-
:read $VIMRUNTIME/vimrc_example.vim
3. °Ê²¼¤Î¤è¤¦¤Ë¥Õ¥¡¥¤¥ë¤Ø½ñ¤¹þ¤ß¤Þ¤¹¡£
-
:write
¼¡²ó Vim ¤òµ¯Æ°¤¹¤ë¤È¡¢¿§¤Å¤±¹½Ê¸¤¬»È¤¨¤ë¤è¤¦¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£
¤³¤Î "vimrc" ¥Õ¥¡¥¤¥ë¤Ø¡¢¤ª¹¥¤ß¤ÎÀßÄê¤òÄɲ乤뤳¤È¤¬¤Ç¤¤Þ¤¹¡£
+ ¤è¤ê¿¤¯¤Î¾ðÊó¤òÆÀ¤ë¤Ë¤Ï :help vimrc-intro ¤È¥¿¥¤¥×¤·¤Þ¤¹¡£
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ¥ì¥Ã¥¹¥ó 7.3: Êä´°
+
+
+ ** CTRL-D ¤È <TAB> ¤Ç¥³¥Þ¥ó¥É¥é¥¤¥ó¤òÊä´°¤¹¤ë **
+
+ 1. ¥³¥ó¥Ñ¥Á¥â¡¼¥É¤Ç¤Ê¤¤¤³¤È¤ò³Îǧ¤·¤Þ¤¹: :set nocp
+
+ 2. ¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ëºß¤ë¥Õ¥¡¥¤¥ë¤ò :!ls ¤« :!dir ¤Ç³Îǧ¤·¤Þ¤¹¡£
+
+ 3. ¥³¥Þ¥ó¥É¤Î³«»Ï¤ò¥¿¥¤¥×¤·¤Þ¤¹: :e
+
+ 4. CTRL-D ¤ò²¡¤¹¤È Vim ¤Ï "e" ¤«¤é»Ï¤Þ¤ë¥³¥Þ¥ó¥É¤Î°ìÍ÷¤òɽ¼¨¤·¤Þ¤¹¡£
+
+ 5. <TAB> ¤ò²¡¤¹¤È Vim ¤Ï ":edit" ¤È¤¤¤¦¥³¥Þ¥ó¥É̾¤òÊä´°¤·¤Þ¤¹¡£
+
+ 6. ¤µ¤é¤Ë¶õÇò¤È¡¢´û¸¤Î¥Õ¥¡¥¤¥ë̾¤Î»Ï¤Þ¤ê¤ò²Ã¤¨¤Þ¤¹: :edit FIL
+
+ 7. <TAB> ¤ò²¡¤¹¤È Vim ¤Ï̾Á°¤òÊä´°¤·¤Þ¤¹¡£(¤â¤·°ì¤Ä¤·¤«Ìµ¤«¤Ã¤¿¾ì¹ç)
+
+NOTE: Êä´°¤Ï¿¤¯¤Î¥³¥Þ¥ó¥É¤ÇÆ°ºî¤·¤Þ¤¹¡£¤½¤·¤Æ CTRL-D ¤È <TAB> ²¡¤·¤Æ¤ß¤Æ¤¯¤À
+ ¤µ¤¤¡£ÆÃ¤Ë :help ¤ÎºÝ¤ËÌòΩ¤Á¤Þ¤¹¡£
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ¥ì¥Ã¥¹¥ó 7 Í×Ìó
+
+
+ 1. ¥Ø¥ë¥×¥¦¥£¥ó¥É¥¦¤ò³«¤¯¤Ë¤Ï :help ¤È¤¹¤ë¤« <F1> ¤â¤·¤¯¤Ï <Help> ¤ò²¡¤¹¡£
+
+ 2. ¥³¥Þ¥ó¥É(cmd)¤Î¥Ø¥ë¥×¤ò¸¡º÷¤¹¤ë¤Ë¤Ï :help cmd ¤È¥¿¥¤¥×¤¹¤ë¡£
+
+ 3. Ê̤Υ¦¥£¥ó¥É¥¦¤Ø¥¸¥ã¥ó¥×¤¹¤ë¤Ë¤Ï CTRL-W CTRL-W ¤È¥¿¥¤¥×¤¹¤ë¡£
+
+ 4. ¥Ø¥ë¥×¥¦¥£¥ó¥É¥¦¤òÊĤ¸¤ë¤Ë¤Ï :q ¤È¥¿¥¤¥×¤¹¤ë¡£
+
+ 5. ¤ª¹¥¤ß¤ÎÀßÄê¤òÊÝ¤Ä¤Ë¤Ï vimrc µ¯Æ°¥¹¥¯¥ê¥×¥È¤òºîÀ®¤¹¤ë¡£
+
+ 6. : command ¤Ç²Äǽ¤ÊÊä´°¤ò¸«¤ë¤Ë¤Ï CTRL-D ¤ò¥¿¥¤¥×¤¹¤ë¡£
+ Êä´°¤ò»ÈÍѤ¹¤ë¤Ë¤Ï <TAB> ¤ò²¡¤¹¡£
+
+
+
+
+
+
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
¤³¤ì¤Ë¤Æ Vim ¤Î¥Á¥å¡¼¥È¥ê¥¢¥ë¤ò½ª¤ï¤ê¤Þ¤¹¡£¥¨¥Ç¥£¥¿¤ò´Êñ¤Ë¡¢¤·¤«¤â½¼Ê¬¤Ë
@@ -805,7 +968,8 @@
Modified for Vim by Bram Moolenaar.
- ÆüËܸìÌõ ¾¾ËÜÂÙ¹° E-mail:mattn@mail.goo.ne.jp
+ ÆüËܸìÌõ ¾¾ËÜ ÂÙ¹° <mattn_jp@hotmail.com>
+ ´Æ½¤ ¼²¬ ÂÀϺ <koron@tka.att.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 3bc8a4c..3bb3c2c 100644
--- a/runtime/tutor/tutor.ja.sjis
+++ b/runtime/tutor/tutor.ja.sjis
@@ -1,25 +1,26 @@
===============================================================================
-= V I M ³ { (`
[gA) Ö æ ¤ ± » - Version 1.5 =
+= V I M ³ { (`
[gA) Ö æ ¤ ± » - Version 1.7 =
===============================================================================
- Vim ÍA±Ì`
[gAÅྷéÉͽ·¬éöÌR}hðõ¦½
- ñíÉÍÈGfB^[Å·B±Ì`
[gAÍA Ƚª Vim
- ð\GfB^[ƵÄg¢±È¹éæ¤ÉÈéÌÉ\ªÈR}hÉ¢Ä
- à¾ð·éæ¤ÈÁĢܷB
+ Vim ÍA±Ì`
[gAÅྷéÉͽ·¬éöÌR}hðõ¦½ñí
+ ÉÍÈGfB^[Å·B±Ì`
[gAÍA Ƚª Vim ð\GfB
+ ^[ƵÄg¢±È¹éæ¤ÉÈéÌÉ\ªÈR}hÉ¢Äà¾ð·éæ¤
+ ÈÁĢܷB
- `
[gA𮹷éÌÉKvÈÔÍAo¦½R}hð·ÌÉÇê
- ¾¯Ôðg¤Ì©ÉàæèÜ·ªA¨æ»25`30ªÅ·B
+ `
[gA𮹷éÌÉKvÈÔÍAo¦½R}hð·ÌÉÇê¾
+ ¯Ôðg¤Ì©ÉàæèÜ·ªA¨æ»25©ç30ªÅ·B
- wÔR}hÉͱ̶ÍðÏX·éàÌà èÜ·BûKðnßéOÉR
- s[ð쬵ܵå¤("vimtutor"µ½ÈçÎAùÉRs[³êĢܷ)B
+ ATTENTION:
+ ȺÌûKpR}hÉͱ̶ÍðÏX·éàÌà èÜ·BûKðnßéO
+ ÉRs[ð쬵ܵå¤("vimtutor"µ½ÈçÎAùÉRs[³êĢܷ)B
- ±Ì`
[gAªAg¤±ÆÅo¦çêédgÝÉÈÁÄ¢é±ÆðAS
- µÄ¨©È¯êÎÈèܹñB³µwK·éÉÍR}hðÀÛɳȯ
- êÎÈçÈ¢ÌÅ·B¶ÍðÇñ¾¾¯ÈçÎA«ÁÆYêĵܢܷ!B
+ ±Ì`
[gAªAg¤±ÆÅo¦çêédgÝÉÈÁÄ¢é±ÆðASµ
+ Ĩ©È¯êÎÈèܹñB³µwK·éÉÍR}hðÀÛɳȯêÎ
+ ÈçÈ¢ÌÅ·B¶ÍðÇñ¾¾¯ÈçÎA«ÁÆYêĵܢܷ!B
- ³ACapsbN(Shift-Lock)L[ª³êĢȢ±ÆðmFµ½ãA
- æÊÉbX1.1 ªS\¦³êéƱëÜÅAj L[ðµÄJ[\ð
- Ú®µÜµå¤B
+ ³ACapsbN(Shift-Lock)L[ª³êĢȢ±ÆðmFµ½ãAæÊÉ
+ bX1.1 ªS\¦³êéƱëÜÅAj L[ðµÄJ[\ðÚ®µÜ
+ µå¤B
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bX 1.1: J[\ÌÚ®
@@ -33,15 +34,15 @@
1. ڮɵêéÜÅAXN[ÅJ[\Ú®³¹Üµå¤B
2. ºÖÌL[(j)ðµÂïéÆAA±µÄڮūܷB
----> ±êÅÌbXÉÚ®·éû@ªí©èܵ½ËB
+ ±êÅÌbXÉÚ®·éû@ªí©èܵ½ËB
3. ºÖÌL[ðgÁÄAbX1.2 ÉÚ®µÜµå¤B
-NOTE: ½ð^CvµÄ¢é©»çÈÈÁ½çA<ESC>ðµÄm[}[hɵÜ
- ·B»ê©çü͵æ¤ÆµÄ¢½R}hðÄü͵ܵå¤B
+Note: ½ð^CvµÄ¢é©»çÈÈÁ½çA<ESC>ðµÄm[}[hɵ
+ Ü·B»ê©çü͵æ¤ÆµÄ¢½R}hðÄü͵ܵå¤B
-NOTE: J[\L[ÅàڮūܷBµ©µ hjkl ðgp·é±ÆÉêxµêĵÜ
- ¦ÎAÍé©É¬Ú®·é±ÆªÅ«éŵå¤B
+Note: J[\L[ÅàڮūܷBµ©µ hjkl ÉêxµêĵܦÎAÍé©
+ ɬڮ·é±ÆªÅ«éŵå¤B¢â}WÅ!
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bX 1.2: VIM ÌN®ÆI¹
@@ -52,27 +53,27 @@
1. <ESC>L[ðµÜµå¤B(mÀÉm[}[hÉ·é½ß)
2. Ìæ¤É^Cv: :q! <ENTER>
+ ±êÉæèÒWµ½àeðÛ¶¹¸ÉGfB^ªI¹µÜ·B
----> ±êÉæèÒWµ½àeðÛ¶¹¸ÉGfB^ªI¹µÜ·B
- ÒWàeðÛ¶µÄI¹·éÆ«ÍÌæ¤É^CvµÜ·:
- :wq <ENTER>
-
- 3. VFvvg©ç`
[gAðnßéÉÍR}hð^CvµÜ·B
+ 3. VFvvgªoÄ«½çA±Ì`
[gAðnßé×ÉÉR}h
+ ð^CvµÜ·B
»ÌR}hÍ: vimtutor <ENTER>
- Êíͱ¤Åµå¤: vim tutor <ENTER>
-
----> 'vim' Í Vim GfB^ÌN®ðA'tutor' ÍÒWµ½¢t@CðÓ¡µÜ·B
4. ±êÜÅÌXebvðo¦©MªÂ¢½ÈçÎAXebv 1 ©ç 3 ÜÅðÀ
- ÛɵÄAVim ð1xI¹µÄ©çÄÑN®µÜµå¤B»ê©çbX
- 1.3ÜÅJ[\ðÚ®³¹Üµå¤B
+ ÛɵÄAVim ð1xI¹µÄ©çÄÑN®µÜµå¤B
+
+NOTE: :q! <ENTER> ÍSÄÌÏXðjüµÜ·BbXÉÄÏXðt@CÉÛ
+ ¶·éû@É¢Äà׵Ģ«Üµå¤B
+
+ 5. 1.3ÜÅJ[\ðÚ®³¹Üµå¤B
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bX 1.3: eLXgÒW - í
** m[}[hÉÄJ[\̶̺ðí·éÉÍ x ðµÜ· **
- 1. ÈºÌ ---> ÆL³ê½³ê½sÉJ[\ðÚ®µÜµå¤B
+ 1. ÈºÌ ---> Ʀ³ê½sÉJ[\ðÚ®µÜµå¤B
2. Ôá¢ðC³·é½ßÉAí·éÅ̶ÜÅJ[\ðÚ®µÜ·B
@@ -82,7 +83,7 @@
---> »Ì ¤¤³¬ Í Â«« 𠱦¦ÄÄ ÆÑÍ˽½
- 5. sª³µÈÁ½çAbX 1.4 ÉÚèܵå¤B
+ 5. sª³µÈÁ½çAbX 1.4 ÖiÝܵå¤B
NOTE: SÄÌbXðʶÄAo¦æ¤Æ·éÌÅÍÈÀÛÉâÁÄÝܵå¤B
@@ -95,15 +96,15 @@
** m[}[hÉÄeLXgð}ü·éÉÍ i ðµÜ· **
- 1. ÈºÌ ---> ÆL³ê½³ê½ÅÌsÉJ[\ðÚ®µÜµå¤B
+ 1. ÈºÌ ---> Ʀ³ê½ÅÌsÉJ[\ðÚ®µÜµå¤B
- 2. 1sÚð2sÚƯ¶lÉ·é½ßÉAeLXgð}üµÈ¯êÎÈçÈ¢Ê
- uÌ̶ÉJ[\ðÚ®µÜ·B
+ 2. 1sÚð2sÚƯ¶lÉ·é½ßÉAeLXgð}üµÈ¯êÎÈçÈ¢Êu
+ Ì̶ÉJ[\ðÚ®µÜ·B
3. i L[ðµÄ©çAÇÁªKvȶð^CvµÜµå¤B
- 4. Ôá¢ðC³µ½ç <ESC> ðµÄR}h[hÉßèA³µ¢¶É
- ÈélÉXebv 2 ©ç 4 ðJèԵܵå¤B
+ 4. Ôá¢ðC³µ½ç <ESC> ðµÄR}h[hÉßèA³µ¢¶ÉÈél
+ ÉXebv 2 ©ç 4 ðJèԵܵå¤B
---> ±Ì ÉÍ «èÈ¢ eLXg éB
---> ±Ì s ÉÍ ô© «èÈ¢ eLXg ª éB
@@ -113,6 +114,52 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ bX 1.5: eLXgÒW - ÇÁ
+
+
+ ** eLXgÇÁ·éÉÍ A ðµÜµå¤ **
+
+ 1. ÈºÌ ---> Ʀ³ê½ÅÌsÉJ[\ðÚ®µÜµå¤B
+ J[\ª»Ì¶ãÉ ÁÄà©Ü¢Ü¹ñB
+
+ 2. ÇÁªKvÈêÅ A ð^CvµÜµå¤B
+
+ 3. eLXgðÇÁµI¦½çA <ESC> ðµÄm[}[hÉßèܵå¤B
+
+ 4. 2sÚÌ ---> Ʀ³ê½êÖÚ®µAXebv 2 ©ç 3 JèԵĶ@ð
+ C³µÜµå¤B
+
+---> ±±ÉÍÔáÁ½eLXgª è
+ ±±ÉÍÔáÁ½eLXgª èÜ·B
+---> ±±ÉàÔáÁ½eLX
+ ±±ÉàÔáÁ½eLXgª èÜ·B
+
+ 5. eLXgÌÇÁªyõÉÈÁÄ«½çbX 1.6 ÖiÝܵå¤B
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ bX 1.6: t@CÌÒW
+
+
+ ** t@CðÛ¶µÄI¹·éÉÍ :wq Æ^CvµÜ· **
+
+ !! NOTE: ȺÌXebvðÀs·éOÉAܸSÌðÇñž³¢!!
+
+ 1. bX 1.2 ÅâÁ½æ¤É :q! ð^CvµÄA±Ì`
[gAðI¹
+ µÜ·B
+
+ 2. VFvvgűÌR}hð^CvµÜ·: vim tutor <ENTER>
+ 'vim'ª Vim GfB^ðN®·éR}hA'tutor' ÍÒWµ½¢t@CÌ
+ ¼OÅ·BÏXµÄàæ¢t@Cðg¢Üµå¤B
+
+ 3. OÌbXÅwñ¾æ¤ÉAeLXgð}üAíµÜ·B
+
+ 4. ÏXðt@CÉÛ¶µÜ·: :wq <ENTER>
+
+ 5. vimtutor ðÄxN®µAȺÌvñÖiÝܵå¤B
+
+ 6. ÈãÌXebvðÇñÅðµ½ãűêðÀsµÜµå¤B
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bX 1 vñ
@@ -127,14 +174,14 @@
4. J[\̶̺ðí·éÉÍAm[}[hÅ x Æ^CvµÜ·B
5. J[\ÌÊuɶð}ü·éÉÍAm[}[hÅ i Æ^CvµÜ·B
- i eLXgÌ^Cv <ESC>
+ i eLXgÌ^Cv <ESC> J[\ÊuÉÇÁ
+ A eLXgÌÇÁ <ESC> sÉÇÁ
-NOTE: <ESC> L[ð·Æm[}[hÉÚsµÜ·B»ÌÛAÔáÁ½èüÍr
- ÌR}hðæèÁ·±ÆªÅ«Ü·B
+NOTE: <ESC> L[ð·Æm[}[hÉÚsµÜ·B»ÌÛAÔáÁ½èüÍr
+ ÌR}hðæèÁ·±ÆªÅ«Ü·B
³ÄA±¯ÄbX 2 ðnßܵå¤B
-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bX 2.1: íR}h
@@ -143,7 +190,7 @@
1. m[}[hÅ é±ÆðmF·é½ßÉ <ESC> ðµÜµå¤B
- 2. ÈºÌ ---> ÆL³ê½³ê½sÉJ[\ðÚ®µÜµå¤B
+ 2. ÈºÌ ---> Ʀ³ê½sÉJ[\ðÚ®µÜµå¤B
3. Áµ½¢PêÌæªÉJ[\ðÚ®µÜµå¤B
@@ -154,7 +201,7 @@
---> ±Ì ¶ ÉÍ ¢Â©Ì ½Ìµ¢ KvÌÈ¢ Pê ª ÜÜêÄ ¢Ü·B
- 5. 3 ©ç 4 ÜÅ𶪳µÈéÜÅJèÔµAbX 2.2 ÉÚèܵå¤B
+ 5. 3 ©ç 4 ÜÅ𶪳µÈéÜÅJèÔµAbX 2.2 ÖiÝܵå¤B
@@ -166,7 +213,7 @@
1. m[}[hÅ é±ÆðmF·éÌÉ <ESC> ðµÜµå¤B
- 2. ÈºÌ ---> ÆL³ê½³ê½sÉJ[\ðÚ®µÜµå¤B
+ 2. ÈºÌ ---> Ʀ³ê½sÉJ[\ðÚ®µÜµå¤B
3. ³µ¢¶ÌöÖJ[\ðÚ®µÜµå¤(ÅÌ . ÌãÅ·)B
@@ -175,77 +222,123 @@
---> N©ª±ÌsÌÅãð2x^CvµÜµ½B 2x^CvµÜµ½B
- 5. Ǥ¢¤±Æ©ð·é½ßÉAbX 2.3 ÖÚèܵå¤B
+ 5. Ǥ¢¤±Æ©ð·é½ßÉAbX 2.3 ÖiÝܵå¤B
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Lesson 2.3: R}hÆÚIê
+ bX 2.3: Iy[^Æ[V
- íR}h d Ì`®ÍÌlÉÈÁĢܷ:
+ ½ÌR}hÍIy[^Æ[V©çeLXgÉÏXðÁÜ·B
+ íR}h d ÌIy[^ÍÌlÉÈÁĢܷ:
- [ñ] d ÚIê àµÍ d [ñ] ÚIê
+ d [V
+
»ê¼ê:
- ñ - »ÌR}hð½ñJèÔ·©(ȪÂ\, Ȫµ½Í =1)B
- d - íR}hB
- ÚIê - ½Éεī©¯é©(Ⱥɰܷ)B
+ d - íR}hB
+ [V - ½Éεī©¯é©(Ⱥɰܷ)B
- ÚIêê:
+ Iy[^Ìêê:
w - J[\Êu©çóðÜÞPêÌöÜÅB
e - J[\Êu©çóðÜÜÈ¢PêÌöÜÅB
$ - J[\Êu©çsÜÅB
-NOTE: `¯µ½¢lÍAm[}[hÉÄR}hȵÉÚIêðµÄ
+ ÂÜè de Æ^Cv·éÆAJ[\Êu©çPêÌIíèÜÅðíµÜ·B
+
+NOTE: `¯µ½¢lÍAm[}[hÉÄR}hȵÉ[VðµÄ
Ýܵå¤BJ[\ªÚIêêŦ³êéÊuÉÚ®·é͸ŷB
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ bX 2.4: [VÉJEgðgp·é
+
+
+ ** ½ñàs¢½¢JèÔµÌ[VÌOÉlð^CvµÜ·B **
+
+ 1. ÈºÌ ---> Ʀ³ê½ÆÌæªÉJ[\ðÚ®µÜ·B
+
+ 2. 2dw ð^CvµÄPê2ªڮµÜ·B
+
+ 3. 3e ð^CvµÄ3ÂÚÌPêÌI[ÉÚ®µÜ·B
+
+ 4. 0 ([)ð^CvµÄsªÉÚ®µÜ·B
+
+ 5. Xebv 2 Æ 3 ðá¤lÆgÁÄJèԵܷB
+
+---> This is just a line with words you can move around in.
+
+ 6. bX 2.5 ÉiÝܵå¤B
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- bX 2.4: »êÈOÌ`ÌR}h
+ bX 2.5: æè½ðí·é½ßÉJEgðgp·é
- ** sSÌðí·éÉÍ dd Æ^CvµÜµå¤ **
+ ** Iy[^ÆJEgð^Cv·éÆA»Ì쪡ñJèÔ³êÜ·B **
- sSÌÌíÍpÉÉsȤìÆÈÌÅAVim ÌÝvÒÍsðí·éÌÉÍA
- PÉñàÉÄ2ñ d ð^Cv·éûªÈP¾ë¤Æ»fµÜµ½B
+ ùqÌíÌIy[^Æ[VÌgÝí¹ÉJEgðÇÁ·é±ÆÅA
+ æè½Ìíªs¦Ü·:
+ d l [V
- 1. ºÉ éêAÌt[YÌ2sÚÉJ[\ðÚ®µÜµå¤B
- 2. dd Æ^CvµÄsðíµÜµå¤B
- 3. ÅÍ4sÚÉÚ®µÄÝܵå¤B
- 4. 2dd Æ^CvµÄ2síµÄÝܵå¤B
- (ñ-R}h-ÚIê Ì`®ðv¢oµÜµå¤)
+ 1. ---> Ʀ³ê½sÌsªªÉJ[\ðÚ®µÜµå¤B
- 1) oÍÔ¢A
- 2) ÂÜçÈ¢àÌÍyµ¢A
- 3) X~Í¢A
- 4) ÍÔðàÁÄ¢éA
- 5) vªð°éA
- 6) »Íâ
- 7) I}Gi[
+ 2. UPPER CASE ÌPê2Âð 2dw Æ^CvµÄíµÜ·B
+
+ 3. UPPER CASE Æ¢¤A±µ½PêðA1ÂÌR}hÆÙÈéJEgðwèµA
+ Xebv 1 Æ 2 ðJèԵܷB
+
+---> ±ÌABC DEsÌFGHI JK LMN OPPêÍQ RS TUVãYíÉÈÁ½B
+
+NOTE: Iy[^ d Æ[VÌÔÉJEgðgÁ½êAIy[^ÌÈ¢
+ êÌ[VÌæ¤É®ìµÜ·B
+ á: 3dw Æ d3w ͯÅA3w ðíµÜ·B
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- bX 2.5: âè¼µR}h
+ bX 2.6: sÌì
+
+
+ ** sSÌðí·éÉÍ dd Æ^CvµÜ· **
+
+ sSÌðí·épxª½¢ÌÅAViÌfUCi[ÍsÌíð d Ì2ñ^CvÆ
+ ¢¤ÈPÈàÌÉßܵ½B
+
+ 1. ȺÌåÌ2sÚÉJ[\ðÚ®µÜ·B
+ 2. dd Æ^CvµÄsðíµÜ·B
+ 3. ³çÉ4sÚÉÚ®µÜ·B
+ 4. 2dd Æ^CvµÄ2sðíµÜ·B
+
+---> 1) oÍÔ¢A
+---> 2) ÂÜçÈ¢àÌÍyµ¢A
+---> 3) X~Í¢A
+---> 4) ÍÔðàÁÄ¢éA
+---> 5) vªð°éA
+---> 6) »Íâ
+---> 7) I}Gi[
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ bX 2.7: âè¼µR}h
** ÅãÌR}hðæèÁ·ÉÍ u ðµÜ·BU ÍsSÌÌæÁÅ·B **
- 1. ÈºÌ ---> ÆL³ê½³ê½sÉJ[\ðÚ®µAÅÌÔá¢ÉJ[\
- ðÚ®µÜµå¤B
+ 1. ÈºÌ ---> Ʀ³ê½sÉJ[\ðÚ®µAÅÌÔá¢ÉJ[\
+ ðÚ®µÜµå¤B
2. x ð^CvµÄ¢çÈ¢æªÌ¶ðíµÜµå¤B
3. ³Au ð^CvµÄÅãÉÀsµ½R}hðæèÁµÜµå¤B
4. ¡xÍAx ðgpµÄëèðSÄC³µÜµå¤B
5. å¶Ì U ð^CvµÄAsð³ÌóÔÉߵܵå¤B
6. u ð^CvµÄ¼OÌ U R}hðæÁµÜµå¤B
- 7. ÅÍR}hðÄÀs·éÌÉ CTRL-R (CTRL ðµ½ÜÜ R ðÅÂ)ð
- ñ^CvµÄÝܵå¤(æÁÌæÁ)B
+ 7. ÅÍR}hðÄÀs·éÌÉ CTRL-R (CTRL ðµ½ÜÜ R ðÅÂ)ðñ
+ ^CvµÄÝܵå¤(æÁÌæÁ)B
---> ±ÌÌsÌÌÔá¢ðC³XµAãÅ»êçÌC³ððæÁµÜÜ··B
- 8. ±êÍÆÄàÖÈR}hÅ·B³bX 2 vñÉÚèܵå¤B
+ 8. ±êÍÆÄàÖÈR}hÅ·B³bX 2 vñÖiÝܵå¤B
@@ -255,24 +348,24 @@
1. J[\Êu©çPêÌöÜÅðí·éÉÍ dw Æ^CvµÜ·B
-
2. J[\Êu©çsÌöÜÅðí·éÉÍ d$ Æ^CvµÜ·B
-
3. sSÌðí·éÉÍ dd Æ^CvµÜ·B
- 4. m[}[hÅÌR}h`®Í
+ 4. [VðJèÔ·ÉÍlðt^µÜ·: 2w
+ 5. ÏXÉp¢éR}hÌ`®Í
+ Iy[^ [l] [V
- [ñ] R}h ÚIê àµÍ R}h [ñ] ÚIê
»ê¼ê:
- ñ - »ÌR}hð½ñJèÔ·©B
- R}h - í d ÌÞŽð·é©B
- ÚIê - Pê w âs $ ÈÇÌÞŽÉεī©¯é©B
+ Iy[^ - í d ÌÞŽð·é©B
+ l - »ÌR}hð½ñJèÔ·©B
+ [V - w (Pê)â $ (s)ÈÇÌÞÅAeLXg̽Éεī©
+ ¯é©B
- 5. OñÌ®ìðæÁ·: u (¬¶ u)
+ 6. sÌæªÉÚ®·éÉÍ[ðgpµÜ·: 0
+
+ 7. OñÌ®ìðæÁ·: u (¬¶ u)
sSÌÌÏXðæÁ·: U (å¶ U)
æÁµÌæÁµ: CTRL-R
-
-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bX 3.1: \èt¯R}h
@@ -302,7 +395,7 @@
** J[\̶̺ðu«·¦éÉÍ r ð^CvµÜ· **
- 1. ÈºÌ ---> ÆL³ê½³ê½ÅÌsÉJ[\ðÚ®µÜµå¤B
+ 1. ÈºÌ ---> Ʀ³ê½ÅÌsÉJ[\ðÚ®µÜµå¤B
2. ÅÌÔá¢ÌæªÉJ[\ðÚ®µÜµå¤B
@@ -313,7 +406,7 @@
---> ±Ìðl͵½ËA»ÌlÍô©âáÁ½L[ðµàµ½!
---> ±Ìsðü͵½ÉA»ÌlÍô©ÔáÁ½L[ðµÜµ½!
- 5. ³AbX 3.2 ÉÚèܵå¤B
+ 5. ³AbX 3.2 ÖiÝܵå¤B
NOTE: ÀÛɵܵå¤BµÄo¦é¾¯É͵Ȣ±ÆB
@@ -325,7 +418,7 @@
** PêÌêAàµÍSÌðÏX·éÉÍ cw Æ^CvµÜ· **
- 1. ÈºÌ ---> ÆL³ê½³ê½ÅÌsÉJ[\ðÚ®µÜµå¤B
+ 1. ÈºÌ ---> Ʀ³ê½ÅÌsÉJ[\ðÚ®µÜµå¤B
2. lubw Ì u ÌÊuÉJ[\ðÚ®µÜµå¤B
@@ -348,14 +441,13 @@
** ÏXR}hÍAíR}hƯ¶lÉIuWFNgðgpµÜ· **
-
1. ÏXR}hÍAíR}hƯ¶æ¤È®ìðµÜ·B»Ì`®Í
- [ñ] c ÚIê àµÍ c [ñ] ÚIê
+ c [l] [V
2. IuWFNg௶ÅAw ÍPêA $ ÍsÈÇÆ¢Á½àÌÅ·B
- 3. ÈºÌ ---> ÆL³ê½³ê½sÉJ[\ðÚ®µÜµå¤B
+ 3. ÈºÌ ---> Ʀ³ê½sÉJ[\ðÚ®µÜµå¤B
4. ÅÌÔá¢ÖJ[\ðÚ®µÜµå¤B
@@ -364,6 +456,7 @@
---> 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: ^CvÌÔá¢ÍobNXy[XL[ðgÁļ·±ÆàÅ«Ü·B
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bX 3 vñ
@@ -376,63 +469,63 @@
2. J[\̶̺ðu«·¦éÉÍAr ð^Cvµ½ãA»êðu«·¦é
¶ð^CvµÜ·B
- 3. ÏXR}hÅÍJ[\Êu©çÁèÌÚIêÅwè³êéI[ÜÅðÏX
- ·é±ÆªÂ\Å·Bá¦Î cw ÈçÎJ[\Êu©çPêÌIíèÜÅA
+ 3. ÏXR}hÅÍJ[\Êu©çÁèÌ[VÅwè³êéI[ÜÅðÏ
+ X·é±ÆªÂ\Å·Bá¦Î cw ÈçÎJ[\Êu©çPêÌIíèÜÅA
c$ ÈçÎsÌIíèÜÅðÏXµÜ·B
4. ÏXR}hÌ`®Í
- [ñ] c ÚIê àµÍ c [ñ] ÚIê
+ c [l] [V
-³AÌbXÉÚèܵå¤B
+³AÌbXÖiÝܵå¤B
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bX 4.1: ÊuÆt@CÌîñ
-
- ** t@CàÅÌÊuÆt@CÌóÔð\¦·éÉÍ CTRL-g ð^CvµÜ·B
- t@CàÌ ésÉÚ®·éÉÍ SHIFT-G ð^CvµÜ· **
+ ** t@CàÅÌÊuÆt@CÌóÔð\¦·éÉÍ CTRL-G ð^CvµÜ·B
+ t@CàÌ ésÉÚ®·éÉÍ G ð^CvµÜ· **
NOTE: XebvðÀs·éOÉA±ÌbXSÄÉÚðʵܵå¤!!
- 1. CTRL ðµ½ÜÜ g ðµÜµå¤By[WÌê＃ éXe[^Xs
- Ét@C¼Æsª\¦³êé͸ŷB Xebv 3 ̽ßÉsÔð
- o¦Ä¨«Üµå¤B(óÒ:[[ª éêÍ»¿çÉÚ)
+ 1. CTRL ðµ½ÜÜ g ðµÜµå¤B±Ììð CTRL-G ÆÄñŢܷB
+ y[WÌêÔºÉt@C¼ÆsÔª\¦³êé͸ŷB Xebv 3̽ß
+ ÉsÔðo¦Ä¨«Üµå¤B
- 2. źsÉÚ®·é½ßÉ shift-G Æ^CvµÜµå¤B
+NOTE: æÊÌEº÷ÉJ[\ÌÊuª\¦³êÄ¢é©àµêܹñB±êÍ
+ 'ruler' IvV(bX6Åà¾)ðÝè·é±ÆÅ\¦³êÜ·B
- 3. æÙÇÌsÌÔð^CvµA shift-G ð^CvµÜµå¤B
- ÅÉ Ctrl-g ðµ½sÉßÁÄé͸ŷB
- (ð^CvµÄ¢éÆ«ÉÍæÊÉ\¦³êܹñ)
+ 2. źsÉÚ®·é½ßÉ G ð^CvµÜµå¤B
+ t@CÌæªÉÚ®·éÉÍ gg Æ^CvµÜµå¤B
+
+ 3. æÙÇÌsÌÔð^Cvµ G ð^CvµÜµå¤BÅÉ CTRL-G ðµ½s
+ ÉßÁÄé͸ŷB
4. ©MªÄ½çXebv 1 ©ç 3 ðÀsµÜµå¤B
-
-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bX 4.2: õR}h
** êåðõ·éÉÍ / ÆAOûõ·éêåð^CvµÜ·B**
- 1. m[}[hÅ / Æ¢¤¶ð^CvµÜ·BæÊê＃ : R}h
- Ư¶lÉ / ª»êé±ÆÉCÃŵå¤B
+ 1. m[}[hÅ / Æ¢¤¶ð^CvµÜ·BæÊê＃ : R}hÆ
+ ¯¶lÉ / ª»êé±ÆÉCÃŵå¤B
2. ÅÍA'errroor' <ENTER> Æ^CvµÜµå¤B±êªõµ½¢PêÅ·B
3. ¯¶êðà¤êxõ·éÆ«Í PÉ n ð^CvµÜ·B
tûüÉêåðõ·éÆ«Í N ð^CvµÜ·B
- 4. tûüÉêåðõµ½¢êÍA/ R}hÌ©íèÉ ? R}hðgpµ
- Ü·B
+ 4. tûüÉêåðõ·éêÍA/ ÌãíèÉ ? R}hðgpµÜ·B
----> "errroor" is not the way to spell error; errroor is an error.
+ 5. ³ÌêÉßéÉÍ CTRL-O (Ctrl 𵱯Ȫç o ¶^Cv)ð^Cvµ
+ Ü·B³çÉßéÉͱêðJèԵܷBCTRL-I ÍOûüÅ·B
-õªt@CÌIíèÉB·éÆAt@CÌ檩çõð±sµÜ·B
-
-
+Note: "errroor" Í error ÆXyªá¢Ü·; errroor Í¢íäé error Å·B
+Note: õªt@CÌIíèÉB·éÆAIvV 'wrapscan' ªÝè³êÄ¢é
+ êÍAt@CÌ檩çõð±sµÜ·B
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bX 4.3: ηéÊðõ
@@ -440,8 +533,7 @@
** ηé ),] â } ðõ·éÉÍ % ð^CvµÜ· **
- 1. ÈºÌ ---> ÆL³ê½³ê½sÅ (,[ © { ÌÇê©ÉJ[\ðÚ®
- µÜµå¤B
+ 1. ºÌ ---> Ŧ³ê½sÅ (,[ © { ÌÇê©ÉJ[\ðÚ®µÜµå¤B
2. »±Å % Æ^CvµÜµå¤B
@@ -449,21 +541,22 @@
4. ÅÌÊÉÚ®·éÉÍ % Æ^CvµÜµå¤B
+ 5. ¼Ì (,),[,],{ or } ÅJ[\ðÚ®µA% ª½ðµÄ¢é©mFµÜµå¤B
+
---> This ( is a test line with ('s, ['s ] and {'s } in it. ))
+
NOTE: ±Ì@\ÍʪêvµÄ¢È¢vOðfobO·éÌÉÆÄàð§¿
Ü·B
-
-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bX 4.4: Ôá¢ðÏX·éû@
** 'old' ð 'new' Éu··éÉÍ :s/old/new/g Æ^CvµÜ· **
- 1. ÈºÌ ---> ÆL³ê½³ê½sÉJ[\ðÚ®µÜµå¤B
+ 1. ÈºÌ ---> Ʀ³ê½sÉJ[\ðÚ®µÜµå¤B
2. :s/thee/the <ENTER> Æ^CvµÜµå¤B±ÌR}hÍ»ÌsÅÅÉ©
©Á½àÌɾ¯sÈíêé±ÆÉCð¯ܵå¤B
@@ -474,27 +567,28 @@
---> thee best time to see thee flowers is in thee spring.
4. ¡s©ç©Â©é¶ðÏX·éÉÍ
- :#,#s/old/new/g #,# ÍQsÌsÔðwµÜ·B
+ :#,#s/old/new/g #,# ÉÍu«·¦éÍÍÌJnÆI¹ÌsÔðwèµÜ
+ ·B
:%s/old/new/g t@CSÌũ©éàÌÉεÄÏX·éB
-
-
-
+ :%s/old/new/gc t@CSÌũ©éàÌÉεÄA1Â1ÂmFðÆèÈ
+ ªçÏX·éB
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bX 4 vñ
- 1. Ctrl-g Ít@CÅÌÊuÆt@CÌÚ×ð\¦µÜ·B
- Shift-G Ít@CÌźsÉÚ®µÜ·BsÔãÉ Shift-G Æ·éÆ
- »ÌsÉÚ®µÜ·B
+ 1. CTRL-G Ít@CÅÌÊuÆt@CÌÚ×ð\¦µÜ·B
+ G Ít@CÌźsÉÚ®µÜ·B
+ l G Í»ÌsÉÚ®µÜ·B
+ gg ÍæªsÉÚ®µÜ·B
2. / ÌãÉêåð^Cv·éÆOûÉêåðõµÜ·B
? ÌãÉêåð^Cv·éÆãûÉêåðõµÜ·B
- õÌã n ÅA¯ûüÉõðÄÑs¢Aܽ N ÅtûüÉõðsÈ¢Ü
- ·B
+ õÌãÌ n ͯ¶ûüÌÌõðAN ÍtûüÌõðµÜ·B
+ CTRL-O ÍêðOÉÚµACTRL-I ÍêðÉÚ®µÜ·B
- 3. (,),[,],{, or } ãÉJ[\ª éóÔÅ % ð^Cv·éÆ
- ε½ÎÉÚ®µÜ·B
+ 3. (,),[,],{, àµÍ } ãÉJ[\ª éóÔÅ % ð^Cv·éÆÎÉÈé¶
+ ÖÚ®µÜ·B
4. »ÝsÌÅÌ old ð new Éu··éB :s/old/new
»ÝsÌSÄÌ old ð new Éu··éB :s/old/new/g
@@ -502,7 +596,6 @@
t@CÌÌSÄÌõêåðu··éB :%s/old/new/g
'c' ðÁ¦éÆu·ÌxÉmFðßéB :%s/old/new/gc
-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bX 5.1: OR}hðÀs·éû@
@@ -519,11 +612,11 @@
VFvvgÌæ¤ÉfBNgÌêª\¦³êé͸ŷB
àµÍ ls ª®©È¢ÈçÎ :!dir ðgpµÜµå¤B
----> NOTE: ±Ìû@ÉæÁÄ çäéR}hªÀs·é±ÆªÅ«Ü·B
+Note: ±Ìû@ÉæÁÄ çäéR}hªÀs·é±ÆªÅ«Ü·Bà¿ëñø
+ à^¦çêÜ·B
----> NOTE: SÄÌ : R}hÍ <ENTER> ðµÄI¹µÈ¯êÎÈèܹñB
-
-
+Note: SÄÌ : R}hÍ <ENTER> ðµÄI¹µÈ¯êÎÈèܹñB
+ È~Åͱ̱ÆɾyµÜ¹ñB
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -540,37 +633,38 @@
3. ÅÍ :w TEST Æ^CvµÜµå¤ (TEST ÍAIñ¾t@C¼Å·)B
4. ±êÉæèt@CS̪ TEST Æ¢¤¼OÅÛ¶³êÜ·B
- à¤êx :!dir Æ^CvµÄmFµÄÝܵå¤B
+ à¤êx :!dir àµÍ !ls Æ^CvµÄmFµÄÝܵå¤B
----> ±±Å Vim ðI¹µAt@C¼ TEST ƤÉN®·éÆAÛ¶µ½Ì
+Note: ±±Å Vim ðI¹µAt@C¼ TEST ƤÉN®·éÆAÛ¶µ½Ì
`
[gAÌ¡»ªÅ«ãªé͸ŷB
- 5. ÅÍA :!del TEST Æ^CvµÄt@CðíµÄÝܵå¤B
-
+ 5. ³çÉAÌæ¤É^CvµÄt@CðÁµÜµå¤(MS-DOS): :!del TEST
+ àµÍ(Unix): :!rm TEST
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bX 5.3: I𵽫Ý
- ** ªIÉÛ¶·éÉÍ :#,# w t@C¼ Æ^CvµÜ· **
+** t@CÌÊuðÛ¶·éÉÍAv [VÆ :w FILENAME ð^CvµÜ·B **
- 1. à¤êxfBNgÌêðæ¾·é½ßÉ :!ls Æ^CvµATEST ÌlÉ
- t@CðêÂIñÅÝܵå¤B
+ 1. ±ÌsÉJ[\ðÚ®µÜ·B
- 2. ±Ìy[WÌnßÜÅJ[\ðÚ®µAt@CÌsðmé½ßÉ Ctrl-g Æ
- ^CvµÜµå¤B»ÌsÔð¯¦Ä¨«Üµå¤B
+ 2. v ðµAȺÌæ5ÚÉJ[\ðÚ®µÜ·BeLXgª²\¦³êéÌ
+ Éڵĺ³¢B
- 3. »µÄy[WÌIèÜÅÚ®µAÄx Ctrl-g ðs¢Ü·B
- ±ÌsÔ௦Ĩ«Üµå¤B
+ 3. ¶ : ð·ÆAæÊÌÅºÉ :'<,'> ª»êÜ·B
- 4. 骾¯ð TEST Æ¢¤¼ÅÛ¶·é½ßÉA:#,# w TEST Æ^CvµÜ·B
- ±Ì #,# Ío¦Ä¨¢½QÂÌÔ(ã[,º[) Å èA TEST ªt@C¼
- ÆÈèÜ·B
+ 4. w TEST (TESET ͶݵȢt@C¼)ð^CvµÜ·B
+ Enter ð·OÉ :'<,'>w TEST ÆÈÁÄ¢é±ÆðmFµÄº³¢B
- 5. ÄxAt@Cª¶Ý·é±ÆðmF·é½ßÉ :!dir Æ^CvµÜµå¤B
- ½¾µ±Ìt@CÍÁµÄÍ¢¯Ü¹ñB
+ 5. Vim Í TEST Æ¢¤t@CÉIð³ê½sð«Þŵå¤B
+ !dir àµÍ !ls Å»êðmFµÜ·B
+ »êÍíµÈ¢Å¨¢Äº³¢BÌbXÅgpµÜ·B
+NOTE: v ð·ÆAVisual IðªnÜèÜ·BJ[\𮩷±ÆÅAIðÍÍð
+ å«à¬³àÅ«Ü·B³çÉA»ÌIðÍÍÉεÄIy[^ðKp
+ «Ü·Bá¦Î d ÍeLXgðíµÜ·B
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bX 5.4: t@CÌæƹ
@@ -578,22 +672,22 @@
** t@CÌgð}ü·éÉÍ :r t@C¼ Æ^CvµÜ· **
- 1. æÙÇÌ TEST Æ¢¤t@Cª¶Ý·é±Æðm©ßé½ßÉ :!dir Æ
- ^CvµÜµå¤B
+ 1. J[\ðȺÌsÉí¹Ü·B
- 2. J[\ð±Ìy[WÌæªÉÚ®µÜ·B
+NOTE: Xebv 2 ÌÀsãAbX 5.3 ÌeLXgª»êÜ·BºÉºªÁı
+ ÌbXÉÚ®µÜµå¤B
-NOTE: Xebv 3 ðÀs·éÆAæÊÉ bX 5.3 ª»íêéÌÅAJ[\ð
- ºÉÚ®µ±ÌbXÜÅßèܵå¤B
+ 2. ÅÍ TEST Æ¢¤t@Cð :r TEST Æ¢¤R}hÅÇÝÝܵå¤B
+ ±±Å¢¤ TEST Íg¤t@C̼O̱ÆÅ·B
+ ÇÝÜê½t@CÍAJ[\sÌºÉ èÜ·B
- 3. ÅÍA:r TEST Æ^CvµÄ TEST t@CðæÝܵå¤B±Ì TEST Í
- t@C¼Å·B
-
-NOTE: t@CÌæÝÍJ[\ÌÊu©çsíêÜ·B
-
- 4. æñ¾t@CðmFµÄÝܵå¤BJ[\ðß·ÆAbX5.3 Ì
+ 3. æñ¾t@CðmFµÄÝܵå¤BJ[\ðß·ÆAbX5.3 Ì
IWiÆt@CÉæéàÌÌ2ª é±Æªí©èÜ·B
+NOTE: OR}hÌoÍðÇÝÞ±ÆàoÜ·Bá¦ÎA
+ :r !ls Í ls R}hÌoÍðJ[\ȺÉÇÝÝÜ·B
+
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bX 5 vñ
@@ -602,19 +696,19 @@
1. :!command ÉæÁÄ OR}hðÀsµÜ·B
æg¤á:
- :!ls - fBNgÌt@Cêð©éB
- :!del t@C¼ - t@C¼Æ¢¤t@CÌí·éB
+ (MS-DOS) (Unix)
+ :!dir :!ls - fBNgàÌêð©éB
+ :!del FILENAME :!rm FILENAME - t@Cðí·éB
2. :w t@C¼ ÉæÁÄt@C¼Æ¢¤t@CªfBXNÉ«ÜêéB
- 3. :#,# w t@C¼ ÉæÁÄ # ©ç # ÜÅðÛ¶·éB
+ 3. v [VÅ :w FILENAME Æ·éÆArW
AIðsªt@CÉÛ¶³
+ êéB
4. :r t@C¼ Éæèt@C¼Æ¢¤t@CªfBXNæèæÜêA
J[\Êu̺É}ü³êéB
-
-
-
+ 5. :r !dir Í dir R}hÌoÍðJ[\ÊuȺÉÇÝÞB
@@ -624,18 +718,18 @@
** o ð^Cv·éÆAJ[\̺ÌsªJ«A}ü[hÉüèÜ· **
- 1. ÈºÌ ---> ÆL³ê½³ê½sÉJ[\ðÚ®µÜµå¤B
+ 1. ÈºÌ ---> Ʀ³ê½sÉJ[\ðÚ®µÜµå¤B
2. o (¬¶) ð^CvµÄAJ[\̺ÌsðJ«A}ü[hÉüèÜ·B
- 3. ---> ÆL³ê½sðʵA<ESC> Æ^CvµÄÇÁ[hðI¹µÜµå¤B
+ 3. ³çÉ}ü[hðI¹·é×É <ESC> ð^CvµÜ·B
---> o ð^Cv·éÆJ[\ÍJ¢½sÖÚ®µ}ü[hÉüèÜ·B
4. J[\ÌãÌsÉ}ü·éÉÍA¬¶Ì o ÅÍÈAPÉå¶Ì O
ð^CvµÜ·BÌsŵÄÝܵå¤B
-±ÌsÌãÖ}ü·éÉÍA±ÌsÖJ[\ðu¢Ä Shift-O ð^CvµÜ·B
+---> ±ÌsÌãÖ}ü·éÉÍA±ÌsÖJ[\ðu¢Ä O ð^CvµÜ·B
@@ -647,94 +741,118 @@
** J[\ÌÌÊu©çeLXgðÇÁ·éÉÍ a Æ^CvµÜ· **
- 1. m[}[hɵÄÈºÌ ---> ÆL³ê½³ê½ÅÌsÅ $ ð^Cvµ
- ÄAI[ÉJ[\ðÚ®µÜµå¤B
+ 1. J[\ð ---> Ŧ³ê½ÆÖÚ®µÜµå¤B
- 2. J[\̶ÌãëÉeLXgðÇÁ·é½ßÉ a (¬¶) ð^CvµÜ
- ·B
+ 2. e ðµÄ li ÌI[ÜÅJ[\ðÚ®µÜ·B
-NOTE: ±êÍÅã̶ÉÄeLXgð}üµA<ESC> ð^CvµÄJ[\ðEÉ
- Ú®µAÅãÉ x ^CvµÄsÉÇÁ·éÆ¢Á½æ¤È i Ì^Cvð
- ð¯é±Æª«Ü·B
+ 3. J[\ÌãëÉeLXgðÇÁ·é½ßÉ a (¬¶) ð^CvµÜ·B
- 3. ³ÄÅÌs𮬵ܵå¤BeLXgª}ü³êéÊuð¯ÎA
- ÇÁR}hÍ}ü[hÆÜÁ½¯¶Å·B
+ 4. »ÌºÌsÌÌæ¤ÈPêÉ®¬³¹Ü·B}ü[hð²¯é×É <ESC> É
+ µÜ·B
----> ±ÌsÅAsɶÍðÇÁ·é
----> ±ÌsÅAsɶÍðÇÁ·éûKð·é±ÆªÅ«éŵå¤B
+ 5. e ðgÁÄÌs®SÈPêÖÚ®µAXebv 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
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- bX 6.3: »Ì¼Ìu·
+ bX 6.3: »Ì¼Ìu·û@
** 1¶Èãðu«·¦éÉÍå¶Ì R Æ^CvµÜµå¤ **
- 1. ÈºÌ ---> ÆL³ê½³ê½sÉJ[\ðÚ®µÜµå¤B
+ 1. ÈºÌ ---> Ʀ³ê½ÆÉJ[\ðÚ®µÜ·BÅÌ xxx ÌæªÉÚ®µ
+ Ü·B
- 2. ---> ÆL³ê½QsÚÆá¤AÅÌPêÌæªÉJ[\ðÚ®µÜµå¤B
- (Pê 'last')
+ 2. R ðµÄA2sÚÌlð^Cv·é±ÆÅAxxx ªu·³êÜ·B
- 3. ±±Å R ð^CvµÄAÅÌsÆÌsª¯¶ÉÈéæ¤Éù¶ÌeLXg
- Öã«^CvµAPsÚÌcè̪𫷦ܵå¤B
+ 3. u·[hð²¯éÉÍ <ESC> ðµÜ·BsÌcèªÏX³êĢȢÜÜÉ
+ Èé±ÆÉӵľ³¢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.
+ 5. cÁ½ xxx ðXebvðJèÔµÄu·µÜµå¤B
- 4. [hð²¯é½ßÉ <ESC> ð^Cv·éÆAÏXµÄ¢È¢ªªcé±Æ
- Éӵܵå¤B
+---> Adding 123 to xxx gives you xxx.
+---> Adding 123 to 456 gives you 579.
-
+NOTE: u·[hÍ}ü[hÉĢܷªASÄÌ^Cv³ê½¶Íù¶Ì¶
+ ðíµÜ·B
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- bX 6.4: IvVÌÝè
+ bX 6.4: eLXgÌRs[Æy[Xg
- ** õâu·ÌÛÉå¶Æ¬¶ð³·élÉIvVðÝèµÜ· **
+ ** eLXgÌRs[ÉÍIy[^ y ðAy[XgÉÍ p ðg¢Ü· **
+
+ 1. ---> Ʀ³ê½sÖÚ®µAJ[\ð "a)" ÌãÉu¢Ä¨«Ü·B
+
+ 2. v ÅrW
A[hðJnµA"first"ÌèOÜÅJ[\ðÚ®µÜ·B
+
+ 3. y ð^CvµÄ²\¦³ê½eLXgð yank (Rs[)µÜ·B
+
+ 4. ÌsÌsÜÅJ[\ðÚ®µÜ·: j$
+
+ 5. p ðµÄ\èt¯(put)Ä©çAð^CvµÜ·: a second <ESC>
+
+ 6. rW
A[hÅ " item." ðIðµAy ÅNAÌsÌsÜÅ j$ Å
+ Ú®µA p ÅeLXgð»±É put µÜ·B
+
+---> a) this is the first item.
+ b)
+
+ Note: Pêð1 yank ·éÌÉ y ðIy[^ÆµÄ yw Æ·é±ÆàoÜ·B
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ bX 6.5: IvVÌÝè
- 1. ȺÌlÉ^CvµÄ 'ignore' ðõµÜµå¤:
- /ignore
+ ** õâu·ÌÛÉå¶/¬¶ð³·éÉÍAIvVðÝèµÜ· **
+
+ 1. ÌlÉü굀 'ignore' ðõµÜµå¤: /ignore <ENTER>
n ðµÄ½x©õðJèԵܷB
- 2. ȺÌlÉ^CvµÄ 'ic' (Ignore Case ̪ŷ) IvVðÝèµÜ·B
- :set ic
+ 2. ÌlÉü굀 'ic' (Ignore Case ̪) IvVðÝèµÜ·: :set ic
3. ÅÍ n ÉæÁÄà¤1x 'ignore' ðõµÜ·B
n ðµÄ³çÉñõðJèԵܵå¤B
- 4. 'hlsearch' Æ 'incsearch' IvVðȺÌlÉÝèµÜµå¤B
- :set hls is
+ 4. 'hlsearch' Æ 'incsearch' IvVðÝèµÜµå¤: :set hls is
- 5. à¤êxõR}hðü͵ÄA½ªN±é©©ÄÝܵå¤:
- /ignore
+ 5. õR}hðÄü͵ÄA½ªN±é©©ÄÝܵå¤: /ignore <ENTER>
+ 6. 嶬¶ÌæÊð³øÉ·éÉÍÌlÉü͵ܷ: :set noic
+
+Note: }b`̲\¦ðâßéÉÍÌlÉü͵ܷ: :nohlsearch
+Note: 1ÂÌõR}h¾¯å¶¬¶ÌæÊðâß½¢ÈçÎAt[YÉ \c
+ ðgpµÜ·: /ignore\c <ENTER>
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bX 6 vñ
-
1. o ð^Cv·éÆJ[\̺ÌsðJ¯ÄA»±Å}ü[hÉÈéB
O (å¶) ð^Cv·éÆJ[\ÌãÌsÅ}ü[hÉÈéB
2. J[\ã̶̩çeLXgðÇÁ·éÉÍ a Æ^Cv·éB
sÉ©®ÅeLXgð}ü·éÉÍå¶ A ð^Cv·éB
- 3. å¶Ì R ð^Cv·éÆu·[hÉüèA<ESC>ð·Æ²¯éB
+ 3. e R}hÍPêÌI[J[\ðÚ®·éB
- 4. ":set xxx" Æ^Cv·éÆIvV "xxx" ªÝè³êéB
+ 4. y Iy[^ÍeLXgð yank (Rs[)µAp Í»êð put (y[Xg)·éB
+ 5. å¶Ì R ð^Cv·éÆu·[hÉüèA<ESC>ð·Æ²¯éB
+ 6. ":set xxx" Æ^Cv·éÆIvV "xxx" ªÝè³êéB
+ 'ic' 'ignorecase' õÉ嶬¶ÌæʵȢ
+ 'is' 'incsearch' õt[Yɪ}b`µÄ¢éªð\¦·é
+ 'hls' 'hlsearch' }b`·é·×ð²\¦·é
+ ·¢ûAZ¢ûAÇ¿çÌIvV¼ÅàgpÅ«Ü·B
-
-
-
-
-
-
+ 7. "no" ðt^µAIvVð³øɵܷ: :set noic
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- bX 7: ICwvR}h
+ bX 7.1: ICwvR}h
+
** ICwvðgpµÜµå¤ **
@@ -744,20 +862,19 @@
- <F1> L[ð·(ൠéÈçÎ)B
- :help <ENTER> Æ^Cv·éB
- wvEBhEð¶éÉÍ :q <ENTER> Æ^CvµÜ·B
+ wvEBhEÌeLXgðÇÞÆAwvÌ®ìªðÅ«Ü·B
+ CTRL-W CTRL-W Æ^Cv·éÆ wvEBhEÖWvµÜ·B
+ :q <ENTER> Æ^Cv·éÆ wvEBhEªÂ¶çêÜ·B
- ":help" R}hÉøð^¦é±ÆÉæèA çäéè¼Ìwvð©Â¯é
- ±ÆªÅ«Ü·B±êçðµÄÝܵå¤(<ENTER> ð^CvµYêÈ¢æ¤É):
+ ":help" R}hÉøð^¦é±ÆÉæèA çäéè¼Ìwvð©Â¯é±Æ
+ ªÅ«Ü·B±êçðµÄÝܵå¤(<ENTER> ð^CvµYêÈ¢æ¤É):
:help w
:help c_<T
:help insert-index
:help user-manual
-
-
-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- bX 8: N®XNvgÌì¬
+ bX 7.2: N®XNvgÌì¬
** Vim ÌÁ¥ðö·é **
@@ -770,15 +887,61 @@
:edit $VIM/_vimrc MS-Windows ü¯
2. ±±ÅTvÌ "vimrc" ðÇÝÝÜ·B
-
:read $VIMRUNTIME/vimrc_example.vim
3. ȺÌæ¤Ét@CÖ«ÝÜ·B
-
:write
ñ Vim ðN®·éÆAFï\¶ªg¦éæ¤ÉÈéŵå¤B
±Ì "vimrc" t@CÖA¨DÝÌÝèðÇÁ·é±ÆªÅ«Ü·B
+ æè½Ìîñð¾éÉÍ :help vimrc-intro Æ^CvµÜ·B
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ bX 7.3: â®
+
+
+ ** CTRL-D Æ <TAB> ÅR}hCðâ®·é **
+
+ 1. Rp`[hÅÈ¢±ÆðmFµÜ·: :set nocp
+
+ 2. »ÝÌfBNgÉÝét@Cð :!ls © :!dir ÅmFµÜ·B
+
+ 3. R}hÌJnð^CvµÜ·: :e
+
+ 4. CTRL-D ð·Æ Vim Í "e" ©çnÜéR}hÌêð\¦µÜ·B
+
+ 5. <TAB> ð·Æ Vim Í ":edit" Æ¢¤R}h¼ð⮵ܷB
+
+ 6. ³çÉóÆAù¶Ìt@C¼ÌnÜèðÁ¦Ü·: :edit FIL
+
+ 7. <TAB> ð·Æ Vim ͼOð⮵ܷB(àµêµ©³©Á½ê)
+
+NOTE: â®Í½ÌR}hÅ®ìµÜ·B»µÄ CTRL-D Æ <TAB> µÄÝľ
+ ³¢BÁÉ :help ÌÛÉð§¿Ü·B
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ bX 7 vñ
+
+
+ 1. wvEBhEðJÉÍ :help Æ·é© <F1> àµÍ <Help> ð·B
+
+ 2. R}h(cmd)Ìwvðõ·éÉÍ :help cmd Æ^Cv·éB
+
+ 3. ÊÌEBhEÖWv·éÉÍ CTRL-W CTRL-W Æ^Cv·éB
+
+ 4. wvEBhEð¶éÉÍ :q Æ^Cv·éB
+
+ 5. ¨DÝÌÝèðÛÂÉÍ vimrc N®XNvgð쬷éB
+
+ 6. : command ÅÂ\Èâ®ð©éÉÍ CTRL-D ð^Cv·éB
+ â®ðgp·éÉÍ <TAB> ð·B
+
+
+
+
+
+
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
±êÉÄ Vim Ì`
[gAðIíèÜ·BGfB^ðÈPÉAµ©à[ªÉ
@@ -805,7 +968,8 @@
Modified for Vim by Bram Moolenaar.
- ú{êó ¼{×O E-mail:mattn@mail.goo.ne.jp
+ ú{êó ¼{ ×O <mattn_jp@hotmail.com>
+ ÄC ºª ¾Y <koron@tka.att.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/src/Makefile b/src/Makefile
index a4b7d20..1cdfd74 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -547,6 +547,10 @@
#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 @@
# 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 4324101..913d3e9 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -106,7 +106,7 @@
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 cb78cd6..b57b567 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -2845,7 +2845,7 @@
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 b0202cd..f857b8f 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -621,7 +621,9 @@
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 @@
{"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},
@@ -14870,6 +14874,52 @@
}
/*
+ * "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
*/
/* ARGSUSED */
@@ -14903,6 +14953,75 @@
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 @@
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;
+ 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 c6cdc5a..5e4d598 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3425,7 +3425,7 @@
* 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 9ab8b88..49e86a4 100644
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -881,11 +881,11 @@
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 0cea5c2..23fdd66 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -495,6 +495,7 @@
# 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 5cfeb8b..61905b0 100644
--- a/src/hardcopy.c
+++ b/src/hardcopy.c
@@ -475,6 +475,7 @@
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 @@
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 e955f7f..601a97a 100644
--- a/src/option.c
+++ b/src/option.c
@@ -1142,7 +1142,7 @@
{(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 @@
{"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 @@
{(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 @@
*(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 @@
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 @@
/* 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 @@
}
/* (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 d3c01ec..4dac4cc 100644
--- a/src/option.h
+++ b/src/option.h
@@ -577,7 +577,7 @@
#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_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 7fa3572..cda7b06 100644
--- a/src/proto/window.pro
+++ b/src/proto/window.pro
@@ -11,7 +11,7 @@
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 7243e1b..2ffce40 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -2887,11 +2887,14 @@
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 @@
* 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 @@
}
}
-#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);
- do_modelines(FALSE);
- aucmd_restbuf(&aco);
- }
#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 f36ac81..d6b9b7d 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -168,7 +168,7 @@
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 @@
#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 @@
#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 @@
#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 @@
#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 @@
if (wp->w_redr_status)
win_redr_status(wp);
if (redraw_tabline)
- draw_tabpage();
+ draw_tabline();
}
#endif
@@ -5543,7 +5543,8 @@
#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 @@
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;
- else
- p = p_stl;
- if (draw_ruler)
+ if (wp == NULL)
{
- p = p_ruf;
- /* advance past any leading group spec - implicit in ru_col */
- if (*p == '%')
- {
- if (*++p == '-')
- p++;
- 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;
-#else
- col = ru_col;
- if (col > (Columns + 1) / 2)
- col = (Columns + 1) / 2;
-#endif
- maxwidth = W_WIDTH(wp) - col;
-#ifdef FEAT_WINDOWS
- if (!wp->w_status_height)
-#endif
- {
- row = Rows - 1;
- --maxwidth; /* writing in last column may cause scrolling */
- fillchar = ' ';
- attr = 0;
- }
+ /* 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
+ {
+ row = W_WINROW(wp) + wp->w_height;
+ fillchar = fillchar_status(&attr, wp == curwin);
+ maxwidth = W_WIDTH(wp);
+
+ if (draw_ruler)
+ {
+ p = p_ruf;
+ /* advance past any leading group spec - implicit in ru_col */
+ if (*p == '%')
+ {
+ if (*++p == '-')
+ p++;
+ 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;
+#else
+ col = ru_col;
+ if (col > (Columns + 1) / 2)
+ col = (Columns + 1) / 2;
+#endif
+ maxwidth = W_WIDTH(wp) - col;
+#ifdef FEAT_WINDOWS
+ 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
+ {
+ 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 @@
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 @@
* 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 @@
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 @@
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 @@
{
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,
+ room = scol - col + tabwidth - 1;
+ if (room > 0)
+ {
+ 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 */
- {
- p += len - (scol - col + tabwidth - 1);
- len = scol - col + tabwidth - 1;
- }
- if (len > 0)
- {
- screen_puts_len(p, len, 0, col, attr);
+ 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 @@
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 @@
#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 @@
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 fac1785..e5f59f2 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1578,6 +1578,7 @@
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 2574f3d..4560153 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -6079,8 +6079,8 @@
"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 @@
"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 @@
"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 e09294a..9458810 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 "