diff options
| author | Silvino Silva <silvino@bk.ru> | 2019-02-16 20:00:38 +0000 |
|---|---|---|
| committer | Silvino Silva <silvino@bk.ru> | 2019-02-16 20:00:38 +0000 |
| commit | e3b1eb62ccda453ee728965605d19e85c62741ea (patch) | |
| tree | 76799c77d09aeefde98b7e76f69776542e0575b2 | |
| parent | 1a98a3de732895b6d10c84657676f72f6826fc0c (diff) | |
| download | doc-e3b1eb62ccda453ee728965605d19e85c62741ea.tar.gz | |
tools vim added vimdiff
| -rw-r--r-- | tools/index.html | 10 | ||||
| -rw-r--r-- | tools/vim.html | 19 |
2 files changed, 23 insertions, 6 deletions
diff --git a/tools/index.html b/tools/index.html index e2eef45..816e651 100644 --- a/tools/index.html +++ b/tools/index.html @@ -27,10 +27,12 @@ <ul> <li><a href="vim.html#vimrc">1. Vim RC</a></li> <li><a href="vim.html#color">2. Color schemes</a></li> - <li><a href="vim.html#spacetab">3. Split and tab</a></li> - <li><a href="vim.html#block">4. Editing Files</a></li> - <li><a href="vim.html#spellcheck">5. Spell check</a></li> - <li><a href="vim.html#plugin">6. Plugins</a></li> + <li><a href="vim.html#split">3. Split and tab</a></li> + <li><a href="vim.html#filebrowser">4. File browser</a></li> + <li><a href="vim.html#block">5. Editing files</a></li> + <li><a href="vim.html#spellcheck">6. Spellcheck</a></li> + <li><a href="vim.html#plugin">7. Plugins</a></li> + <li><a href="vim.html#vimdiff">8. Vimdiff</a></li> </ul> </li> <li><a href="gnupg.html">Gpg</a> diff --git a/tools/vim.html b/tools/vim.html index b3354d8..441fc50 100644 --- a/tools/vim.html +++ b/tools/vim.html @@ -44,7 +44,7 @@ <p>Default vimrc skeleton is configured to use wombat2mod, which is installed by adduser skeleton.</p> - <h2 id="spacetab">3. Split and Tab</h2> + <h2 id="split">3. Split and Tab</h2> <p>Horizontal split;</p> <pre> @@ -179,12 +179,27 @@ comma (,), press esc to confirm.</dd> </dl> - <h2 id="spellcheck">6. Spell check</h2> + <h2 id="spellcheck">6. Spellcheck</h2> <p>Press z= over the bad written word and select desired one.</p> <h2 id="plugin">7. Plugins</h2> + <h2 id="vimdiff">8. Vimdiff</h2> + + <p>If two files are open in <a href="#split">split</a> type :diffthis in both windows to get vimdiff of the files. To close type :diffoff.</p> + + <dl> + <dt>do<dt> + <dd> Get changes from other window into the current window.</dd> + <dt>dp</dt> + <dd>Put the changes from current window into the other window.</dd> + <dt>]c</dd> + <dd>Jump to the next change.</dd> + <dt>[c - Jump to the previous change.</dd> + <dt>Ctrl W + Ctrl W - Switch to the other split window.</dd> + </dl> + <a href="index.html">Systools Index</a> <p>This is part of the Hive System Documentation. Copyright (C) 2019 |