source: patches/vim-7.0-fixes-12.patch@ d28a23b

configure

@@ -3 +3 @@
 # This is just a stub for the Unix configure script, to provide support for
 # doing "./configure" in the top Vim directory.
 
-cd src && ./configure "$@"
+cd src && exec ./configure "$@"

runtime/autoload/ccomplete.vim

@@ -1 +1 @@
 " Vim completion script
 " Language:     C
 " Maintainer:   Bram Moolenaar <Bram@vim.org>
-" Last Change:  2006 May 03
+" Last Change:  2006 May 08
 
 
 " This function is used for the 'omnifunc' option.
@@ -458 +458 @@
 " member.
 function! s:StructMembers(typename, items, all)
   " Todo: What about local structures?
-  let fnames = join(map(tagfiles(), 'escape(v:val, " \\")'))
+  let fnames = join(map(tagfiles(), 'escape(v:val, " \\#%")'))
   if fnames == ''
     return []
   endif

runtime/autoload/gzip.vim

@@ -1 +1 @@
 " Vim autoload file for editing compressed files.
 " Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2006 Mar 31
+" Last Change: 2006 Jul 19
 
 " These functions are used by the gzip plugin.
 
@@ -127 +127 @@
     let nmt = s:tempname(nm)
     if rename(nm, nmt) == 0
       if exists("b:gzip_comp_arg")
-        call system(a:cmd . " " . b:gzip_comp_arg . " " . nmt)
+        call system(a:cmd . " " . b:gzip_comp_arg . " '" . nmt . "'")
       else
-        call system(a:cmd . " " . nmt)
+        call system(a:cmd . " '" . nmt . "'")
       endif
       call rename(nmt . "." . expand("<afile>:e"), nm)
     endif

runtime/autoload/paste.vim

@@ -1 +1 @@
 " Vim support file to help with paste mappings and menus
 " Maintainer:   Bram Moolenaar <Bram@vim.org>
-" Last Change:  2006 Apr 21
+" Last Change:  2006 Jun 23
 
 " Define the string to use for items that are present both in Edit, Popup and
 " Toolbar menu.  Also used in mswin.vim and macmap.vim.
@@ -12 +12 @@
 if has("virtualedit")
   let paste#paste_cmd = {'n': ":call paste#Paste()<CR>"}
   let paste#paste_cmd['v'] = '"-c<Esc>' . paste#paste_cmd['n']
-  let paste#paste_cmd['i'] = '<Esc>' . paste#paste_cmd['n'] . 'gi'
+  let paste#paste_cmd['i'] = 'x<BS><Esc>' . paste#paste_cmd['n'] . 'gi'
 
   func! paste#Paste()
     let ove = &ve

runtime/autoload/spellfile.vim

@@ -1 +1 @@
 " Vim script to download a missing spell file
 " Maintainer:   Bram Moolenaar <Bram@vim.org>
-" Last Change:  2006 Feb 01
+" Last Change:  2006 Aug 29
 
 if !exists('g:spellfile_URL')
-  let g:spellfile_URL = 'ftp://ftp.vim.org/pub/vim/unstable/runtime/spell'
+  let g:spellfile_URL = 'ftp://ftp.vim.org/pub/vim/runtime/spell'
 endif
 let s:spellfile_URL = ''    " Start with nothing so that s:donedict is reset.
 
@@ -61 +61 @@
     new
     setlocal bin
     echo 'Downloading ' . fname . '...'
-    exe 'Nread ' g:spellfile_URL . '/' . fname
+    call spellfile#Nread(fname)
     if getline(2) !~ 'VIMspell'
       " Didn't work, perhaps there is an ASCII one.
       g/^/d
       let fname = a:lang . '.ascii.spl'
       echo 'Could not find it, trying ' . fname . '...'
-      exe 'Nread ' g:spellfile_URL . '/' . fname
+      call spellfile#Nread(fname)
       if getline(2) !~ 'VIMspell'
         echo 'Sorry, downloading failed'
         bwipe!
@@ -95 +95 @@
         g/^/d
         let fname = substitute(fname, '\.spl$', '.sug', '')
         echo 'Downloading ' . fname . '...'
-        exe 'Nread ' g:spellfile_URL . '/' . fname
+        call spellfile#Nread(fname)
         if getline(2) !~ 'VIMsug'
           echo 'Sorry, downloading failed'
         else
@@ -109 +109 @@
     bwipe
   endif
 endfunc
+
+" Read "fname" from the server.
+function! spellfile#Nread(fname)
+  if g:spellfile_URL =~ '^ftp://'
+    " for an ftp server use a default login and password to avoid a prompt
+    let machine = substitute(g:spellfile_URL, 'ftp://\([^/]*\).*', '\1', '')
+    let dir = substitute(g:spellfile_URL, 'ftp://[^/]*/\(.*\)', '\1', '')
+    exe 'Nread "' . machine . ' anonymous vim7user ' . dir . '/' . a:fname . '"'
+  else
+    exe 'Nread ' g:spellfile_URL . '/' . a:fname
+  endif
+endfunc

runtime/plugin/matchparen.vim

@@ -1 +1 @@
 " Vim plugin for showing matching parens
 " Maintainer:  Bram Moolenaar <Bram@vim.org>
-" Last Change: 2006 Apr 27
+" Last Change: 2006 Sep 09
 
 " Exit quickly when:
 " - this plugin was already loaded (or disabled)
@@ -44 +44 @@
   let before = 0
 
   let c = getline(c_lnum)[c_col - 1]
-  let plist = split(&matchpairs, ':\|,')
+  let plist = split(&matchpairs, '.\zs[:,]')
   let i = index(plist, c)
   if i < 0
     " not found, in Insert mode try character before the cursor
@@ -90 +90 @@
   " Find the match.  When it was just before the cursor move it there for a
   " moment.
   if before > 0
-    let save_cursor = getpos('.')
+    let save_cursor = winsaveview()
     call cursor(c_lnum, c_col - before)
   endif
 
   " When not in a string or comment ignore matches inside them.
   let s_skip ='synIDattr(synID(line("."), col("."), 0), "name") ' .
-        \ '=~?  "string\\|comment"'
+        \ '=~?  "string\\|character\\|singlequote\\|comment"'
   execute 'if' s_skip '| let s_skip = 0 | endif'
 
   let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline)
 
   if before > 0
-    call setpos('.', save_cursor)
+    call winrestview(save_cursor)
   endif
 
   " If a match is found setup match highlighting.

runtime/scripts.vim

@@ -1 +1 @@
 " Vim support file to detect file types in scripts
 "
 " Maintainer:   Bram Moolenaar <Bram@vim.org>
-" Last change:  2006 Mar 28
+" Last change:  2006 Jul 08
 
 " This file is called by an autocommand for every file that has just been
 " loaded into a buffer.  It checks if the type of file can be recognized by
@@ -54 +54 @@
     let s:name = substitute(s:line1, '^#!\s*\S*[/\\]\(\i\+\).*', '\1', '')
   endif
 
+  " tcl scripts may have #!/bin/sh in the first line and "exec wish" in the
+  " third line.  Suggested by Steven Atkinson.
+  if getline(3) =~ '^exec wish'
+    let s:name = 'wish'
+  endif
+
   " Bourne-like shell scripts: bash bash2 ksh ksh93 sh
   if s:name =~ '^\(bash\d*\|\|ksh\d*\|sh\)\>'
     call SetFileTypeSH(s:line1) " defined in filetype.vim

runtime/tutor/Makefile

@@ -2 +2 @@
 #
 # The Japanese tutor exists in three encodings.  Use the UTF-8 version as the
 # original and create the others with conversion.
+#
+# Similarly for Russian and Korean
 
-all: tutor.ja.sjis tutor.ja.euc tutor.ko.euc
+all: tutor.ja.sjis tutor.ja.euc \
+        tutor.ko.euc \
+        tutor.ru tutor.ru.cp1251 \
+        tutor.gr tutor.gr.cp737
 
 tutor.ja.sjis: tutor.ja.utf-8
         nkf -WXs tutor.ja.utf-8 > tutor.ja.sjis
@@ -13 +18 @@
 
 tutor.ko.euc: tutor.ko.utf-8
         iconv -f UTF-8 -t EUC-KR tutor.ko.utf-8 > tutor.ko.euc
+
+tutor.ru: tutor.ru.utf-8
+        iconv -f UTF-8 -t KOI8-R tutor.ru.utf-8 > tutor.ru
+
+tutor.ru.cp1251: tutor.ru.utf-8
+        iconv -f UTF-8 -t cp1251 tutor.ru.utf-8 > tutor.ru.cp1251
+
+tutor.gr: tutor.gr.utf-8
+        iconv -f UTF-8 -t ISO-8859-7 tutor.gr.utf-8 > tutor.gr
+
+tutor.gr.cp737: tutor.gr.utf-8
+        iconv -f UTF-8 -t cp737 tutor.gr.utf-8 > tutor.gr.cp737

runtime/tutor/tutor.gr.utf-8

@@ +1 @@
+===============================================================================
+=    Î. αλ Ï. Ï. ή ρ Ξ α Ï. ε    Ï. Ï. ο   V I M   T u t o r    -    Î.κΎοÏ.η 1.5     =
+===============================================================================
+
+     Î. Vim είΜαι έΜαÏ. Ï.αΜίÏ.Ï.Ï.ροÏ. Ï.Ï.ÎœÏ.άκÏ.ηÏ. Ï.οÏ. έÏ.ει Ï.ολλέÏ. εΜÏ.ολέÏ., Ï.άρα
+     Ï.ολλέÏ. για Μα εΟηγήÏ.οÏ.Όε Ï.ε Όία Ï.εριήγηÏ.η Ï.Ï.Ï.Ï. αÏ.Ï.ή. Î.Ï.Ï.ή η Ï.εριήγηÏ.η
+     Ï.Ï.εΎιάÏ.Ï.ηκε για Μα Ï.εριγράÏ.ει ικαΜοÏ.οιηÏ.ικά Ï.ιÏ. εΜÏ.ολέÏ. Ï.οÏ. Ξα Ï.αÏ.
+     κάΜοÏ.Îœ Μα Ï.ρηÏ.ιΌοÏ.οιείÏ.ε εύκολα Ï.οΜ Vim Ï.αΜ έΜαΜ γεΜικήÏ. Ï.ρήÏ.ηÏ. Ï.Ï.ÎœÏ.άκÏ.η.
+
+     Î. καÏ.ά Ï.ροÏ.έγγιÏ.η Ï.ρÏ.ΜοÏ. Ï.οÏ. αÏ.αιÏ.είÏ.αι για Μα ολοκληρÏ.Ï.εÏ.ε Ï.ηΜ Ï.εριήγηÏ.η
+     είΜαι 25-30 λεÏ.Ï.ά, εΟαρÏ.Ï.ÎœÏ.αÏ. αÏ.Ï. Ï.ο Ï.Ï.Ï.ο Ï.ρÏ.Μο Ξα ΟοΎέÏ.εÏ.ε για
+     Ï.ειραΌαÏ.ιÏ.ΌούÏ..
+
+     Î.ι εΜÏ.ολέÏ. Ï.Ï.α ΌαΞήΌαÏ.α Ξα Ï.ροÏ.οÏ.οιήÏ.οÏ.Îœ Ï.ο κείΌεΜο. Î.ηΌιοÏ.ργήÏ.Ï.ε έΜα
+     αΜÏ.ίγραÏ.ο αÏ.Ï.ού Ï.οÏ. αρÏ.είοÏ. για Μα εΟαÏ.κηΞείÏ.ε (αΜ ΟεκιΜήÏ.αÏ.ε Ï.ο
+     "Vimtutor" αÏ.Ï.Ï. είΜαι ήΎη έΜα αΜÏ.ίγραÏ.ο).
+
+     Î.ίΜαι Ï.ηΌαΜÏ.ικÏ. Μα ΞÏ.ΌάÏ.Ï.ε Ï.Ï.ι αÏ.Ï.ή η Ï.εριήγηÏ.η είΜαι οργαΜÏ.ΌέΜη έÏ.Ï.ι
+     Ï.Ï.Ï.ε Μα ΎιΎάÏ.κει ΌέÏ.Ï. Ï.ηÏ. Ï.ρήÏ.ηÏ.. Î.Ï.Ï.Ï. Ï.ηΌαίΜει Ï.Ï.ι Ï.ρειάζεÏ.αι Μα
+     εκÏ.ελείÏ.ε Ï.ιÏ. εΜÏ.ολέÏ. για Μα Ï.ιÏ. ΌάΞεÏ.ε Ï.Ï.Ï.Ï.ά. Î.Îœ ΎιαβάζεÏ.ε ÎŒÏ.Μο Ï.ο
+     κείΌεΜο, Ξα Ï.ιÏ. ΟεÏ.άÏ.εÏ.ε!
+
+     ΀Ï.ρα, βεβαιÏ.ΞείÏ.ε Ï.Ï.ι Ï.ο Ï.λήκÏ.ρο Shift-Lock Î.Î.Ν είΜαι Ï.αÏ.ηΌέΜο και
+     Ï.αÏ.ήÏ.Ï.ε Ï.ο Ï.λήκÏ.ρο j αρκεÏ.έÏ. Ï.ορέÏ. για Μα ΌεÏ.ακιΜήÏ.εÏ.ε Ï.οΜ ΎροΌέα έÏ.Ï.ι
+     Ï.Ï.Ï.ε Ï.ο Î.άΞηΌα 1.1 Μα γεΌίÏ.ει Ï.λήρÏ.Ï. Ï.ηΜ οΞÏ.Μη.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                      Î.άΞηΌα 1.1:  Î.Î.΀Î.Î.Î.ΝÎ.Ν΀Î.Σ ΀Î.Ν Î.ΡÎ.Î.Î.Î.
+
+  ** Î.ια Μα κιΜήÏ.εÏ.ε Ï.οΜ ΎροΌέα, Ï.αÏ.ήÏ.Ï.ε Ï.α Ï.λήκÏ.ρα h,j,k,l Ï.Ï.Ï.Ï. ΎείÏ.ΜεÏ.αι. **
+             ^
+             k        Hint: ΀ο Ï.λήκÏ.ρο h είΜαι αριÏ.Ï.ερά και κιΜεί Ï.Ï.' αριÏ.Ï.ερά.
+       < h       l >        ΀ο Ï.λήκÏ.ρο l είΜαι ΎεΟιά και κιΜεί Ï.Ï.α ΎεΟιά.
+             j              ΀ο Ï.λήκÏ.ρο j Όοιάζει Όε βελάκι Ï.ροÏ. Ï.α κάÏ.Ï..
+             v
+
+  1. Î.εÏ.ακιΜείÏ.Ï.ε Ï.οΜ ΎροΌέα Ï.ριγύρÏ. Ï.Ï.ηΜ οΞÏ.Μη ΌέÏ.ρι Μα ΜοιÏ.ΞεÏ.ε άΜεÏ.α.
+
+  2. Î.ραÏ.ήÏ.Ï.ε Ï.αÏ.ηΌέΜο Ï.ο κάÏ.Ï. Ï.λήκÏ.ρο (j) ΌέÏ.ρι Μα εÏ.αΜαληÏ.Ξεί.
+---> ΀Ï.ρα ΟέρεÏ.ε Ï.Ï.Ï. Μα ΌεÏ.ακιΜηΞείÏ.ε Ï.Ï.ο εÏ.Ï.ΌεΜο ΌάΞηΌα.
+
+  3. ΧρηÏ.ιΌοÏ.οιÏ.ÎœÏ.αÏ. Ï.ο κάÏ.Ï. Ï.λήκÏ.ρο, ΌεÏ.ακιΜηΞείÏ.ε Ï.Ï.ο Î.άΞηΌα 1.2.
+
+ΣηΌείÏ.Ï.η: Î.Îœ αΌÏ.ιβάλλεÏ.ε για κάÏ.ι Ï.οÏ. Ï.αÏ.ήÏ.αÏ.ε, Ï.αÏ.ήÏ.Ï.ε <ESC> για Μα βρεΞείÏ.ε
+          Ï.Ï.ηΜ Î.αΜοΜική Î.αÏ.άÏ.Ï.αÏ.η. Î.εÏ.ά Ï.αÏ.ήÏ.Ï.ε ΟαΜά Ï.ηΜ εΜÏ.ολή Ï.οÏ. ΞέλαÏ.ε.
+
+ΣηΌείÏ.Ï.η: ΀α Ï.λήκÏ.ρα Ï.οÏ. ΎροΌέα Ξα Ï.ρέÏ.ει εÏ.ίÏ.ηÏ. Μα ΎοÏ.λεύοÏ.Îœ. Î.λλά Όε Ï.α hjkl
+          Ξα ÎŒÏ.ορείÏ.ε Μα κιΜηΞείÏ.ε Ï.ολύ γρηγορÏ.Ï.ερα, ÎŒÏ.λιÏ. Ï.α Ï.Ï.ΜηΞίÏ.εÏ.ε.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                Î.άΞηΌα 1.2:  Î.Î Î.Î.ΝÎ.Ν΀Î.Σ Î.Î.Î. Î.Î.Î.Î.ΝÎ.Ν΀Î.Σ Σ΀Î.Ν VIM
+
+  !! ΣÎ.Î.Î.Î.ΩΣÎ.: ΠριΜ εκÏ.ελέÏ.εÏ.ε κάÏ.οιο αÏ.Ï. Ï.α βήΌαÏ.α, ΎιαβάÏ.Ï.ε Ï.λο Ï.ο ΌάΞηΌα!!
+
+  1. ΠαÏ.ήÏ.Ï.ε Ï.ο Ï.λήκÏ.ρο <ESC> (για Μα είÏ.Ï.ε Ï.ίγοÏ.ρα Ï.Ï.ηΜ Î.αΜοΜική Î.αÏ.άÏ.Ï.αÏ.η).
+
+  2. ΠληκÏ.ρολογήÏ.Ï.ε:              :q! <ENTER>.
+
+---> Î.Ï.Ï.Ï. εΟέρÏ.εÏ.αι αÏ.Ï. Ï.οΜ Ï.Ï.ÎœÏ.άκÏ.η ΧΩΡÎ.Σ Μα Ï.Ï.Ï.ει Ï.Ï.οιεÏ. αλλαγέÏ. έÏ.εÏ.ε κάΜει.
+     Î.Îœ ΞέλεÏ.ε Μα Ï.Ï.Ï.εÏ.ε Ï.ιÏ. αλλαγέÏ. και Μα εΟέρΞεÏ.ε Ï.ληκÏ.ρολογήÏ.Ï.ε:
+              :wq <ENTER>
+
+  3. Î.Ï.αΜ ΎείÏ.ε Ï.ηΜ Ï.ροÏ.ροÏ.ή Ï.οÏ. Ï.λοιού, Ï.ληκÏ.ρολογήÏ.Ï.ε Ï.ηΜ εΜÏ.ολή Όε Ï.ηΜ οÏ.οία
+     ÎŒÏ.ήκαÏ.ε Ï.ε αÏ.Ï.ήΜ Ï.ηΜ Ï.εριήγηÏ.η. Î.Ï.ορεί Μα είΜαι:    vimtutor <ENTER>
+     Î.αΜοΜικά Ξα Ï.ρηÏ.ιΌοÏ.οιούÏ.αÏ.ε:                    vim tutor <ENTER>
+
+---> 'vim' Ï.ηΌαίΜει ειÏ.αγÏ.γή Ï.Ï.οΜ Ï.Ï.ÎœÏ.άκÏ.η vim, 'tutor' είΜαι Ï.ο αρÏ.είο Ï.οÏ.
+     ΞέλοÏ.Όε Μα ΎιορΞÏ.Ï.οÏ.Όε.
+
+  4. Î.Îœ έÏ.εÏ.ε αÏ.οΌΜηΌοΜεύÏ.ει αÏ.Ï.ά Ï.α βήΌαÏ.α και έÏ.εÏ.ε αÏ.Ï.οÏ.εÏ.οίΞηÏ.η, εκÏ.ελέÏ.Ï.ε
+     Ï.α βήΌαÏ.α 1 έÏ.Ï. 3 για Μα βγείÏ.ε και Μα ÎŒÏ.είÏ.ε ΟαΜά Ï.Ï.οΜ Ï.Ï.ÎœÏ.άκÏ.η. Î.εÏ.ά
+     ΌεÏ.ακιΜήÏ.Ï.ε Ï.οΜ ΎροΌέα κάÏ.Ï. Ï.Ï.ο Î.άΞηΌα 1.3.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                   Î.άΞηΌα 1.3:  Î.Î.Î.ΡÎ.ΩΣÎ. Î.Î.Î.Î.Î.ΝÎ.Î¥ - Î.Î.Î.Î.ΡÎ.ΊÎ.
+
+   ** Î.Ï.ο είÏ.Ï.ε Ï.Ï.ηΜ Î.αΜοΜική Î.αÏ.άÏ.Ï.αÏ.η Ï.αÏ.ήÏ.Ï.ε  x  για Μα ΎιαγράÏ.εÏ.ε Ï.οΜ
+      Ï.αρακÏ.ήρα κάÏ.Ï. αÏ.Ï. Ï.οΜ ΎροΌέα. **
+
+  1. Î.εÏ.ακιΜείÏ.Ï.ε Ï.οΜ ΎροΌέα Ï.Ï.ηΜ Ï.αρακάÏ.Ï. γραΌΌή Ï.ηΌειÏ.ΌέΜη Όε --->.
+
+  2. Î.ια Μα ΎιορΞÏ.Ï.εÏ.ε Ï.α λάΞη, κιΜείÏ.Ï.ε Ï.οΜ ΎροΌέα ΌέÏ.ρι Μα είΜαι Ï.άΜÏ. αÏ.Ï.
+     Ï.οΜ Ï.αρακÏ.ήρα Ï.οÏ. Ξα ΎιαγραÏ.εί.
+
+  3. ΠαÏ.ήÏ.Ï.ε Ï.ο Ï.λήκÏ.ρο x για Μα ΎιαγράÏ.εÏ.ε Ï.οΜ αΜεÏ.ιΞύΌηÏ.ο Ï.αρακÏ.ήρα.
+
+  4. Î.Ï.αΜαλάβεÏ.ε Ï.α βήΌαÏ.α 2 ΌέÏ.ρι 4 ΌέÏ.ρι η Ï.ρÏ.Ï.αÏ.η Μα είΜαι Ï.Ï.Ï.Ï.ή.
+
+---> The ccow jumpedd ovverr thhe mooon.
+
+  5. ΀Ï.ρα Ï.οÏ. η γραΌΌή είΜαι Ï.Ï.Ï.Ï.ή, Ï.ηγαίΜÏ.ε Ï.Ï.ο Î.άΞηΌα 1.4.
+
+ΣÎ.Î.Î.Î.ΩΣÎ.: Î.αΞÏ.Ï. ΎιαÏ.ρέÏ.εÏ.ε αÏ.Ï.ήΜ Ï.ηΜ Ï.εριήγηÏ.η, Ï.ροÏ.Ï.αΞήÏ.Ï.ε Μα ΌηΜ
+          αÏ.οΌΜηΌοΜεύεÏ.ε, ΌαΞαίΜεÏ.ε Όε Ï.η Ï.ρήÏ.η.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                   Î.άΞηΌα 1.4: Î.Î.Î.ΡÎ.ΩΣÎ. Î.Î.Î.Î.Î.ΝÎ.Î¥ - Î Î.ΡÎ.Î.Î.Î.Î.Î.
+
+ ** Î.Ï.ο είÏ.Ï.ε Ï.ε Î.αΜοΜική Î.αÏ.άÏ.Ï.αÏ.η Ï.αÏ.ήÏ.Ï.ε  i  για Μα Ï.αρεΌβάλλεÏ.ε κείΌεΜο. **
+
+  1. Î.εÏ.ακιΜείÏ.Ï.ε Ï.οΜ ΎροΌέα ΌέÏ.ρι Ï.ηΜ Ï.ρÏ.Ï.η γραΌΌή Ï.αρακάÏ.Ï. Ï.ηΌειÏ.ΌέΜη Όε --->.
+
+  2. Î.ια Μα κάΜεÏ.ε Ï.ηΜ Ï.ρÏ.Ï.η γραΌΌή ίΎια Όε Ï.ηΜ ΎεύÏ.ερη, ΌεÏ.ακιΜείÏ.Ï.ε Ï.οΜ
+     ΎροΌέα Ï.άΜÏ. Ï.Ï.οΜ Ï.ρÏ.Ï.ο Ï.αρακÏ.ήρα Î.Î.΀Î. αÏ.Ï. Ï.Ï.οÏ. Ξα Ï.αρεΌβληΞεί Ï.ο κείΌεΜο.
+
+  3. ΠαÏ.ήÏ.Ï.ε Ï.ο  i  και Ï.ληκÏ.ρολογήÏ.Ï.ε Ï.ιÏ. αÏ.αραίÏ.ηÏ.εÏ. Ï.ροÏ.ΞήκεÏ..
+
+  4. Î.αΞÏ.Ï. ΎιορΞÏ.ΜεÏ.ε κάΞε λάΞοÏ. Ï.αÏ.ήÏ.Ï.ε <ESC> για Μα εÏ.ιÏ.Ï.ρέÏ.εÏ.ε Ï.Ï.ηΜ
+     Î.αΜοΜική Î.αÏ.άÏ.Ï.αÏ.η. Î.Ï.αΜαλάβεÏ.ε Ï.α βήΌαÏ.α 2 ΌέÏ.ρι 4 για Μα ΎιορΞÏ.Ï.εÏ.ε
+     Ï.ηΜ Ï.ρÏ.Ï.αÏ.η.
+
+---> There is text misng this .
+---> There is some text missing from this line.
+
+  5. Î.Ï.αΜ είÏ.Ï.ε άΜεÏ.οι Όε Ï.ηΜ Ï.αρεΌβολή κειΌέΜοÏ. ΌεÏ.ακιΜηΞείÏ.ε Ï.Ï.ηΜ
+     Ï.αρακάÏ.Ï. Ï.ερίληÏ.η.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                               Î.Î.Î.Î.Î.Î. 1 Î Î.ΡÎ.Î.Î.ΚÎ.
+
+
+  1. Î. ΎροΌέαÏ. κιΜείÏ.αι Ï.ρηÏ.ιΌοÏ.οιÏ.ÎœÏ.αÏ. είÏ.ε Ï.α Ï.λήκÏ.ρα ΎροΌέα ή Ï.α hjkl.
+         h (αριÏ.Ï.έρα)   j (κάÏ.Ï.)    k (Ï.άΜÏ.)    l (ΎεΟιά)
+
+  2. Î.ια Μα ÎŒÏ.είÏ.ε Ï.Ï.οΜ Vim (αÏ.Ï. Ï.ηΜ Ï.ροÏ.ροÏ.ή %) γράÏ.Ï.ε:  vim Î.ΡΧÎ.Î.Î. <ENTER>
+
+  3. Î.ια Μα βγείÏ.ε γράÏ.Ï.ε:  <ESC>   :q!   <ENTER>   για αÏ.Ï.ρριÏ.η Ï.Ï.Îœ αλλαγÏ.Îœ.
+                 Î. γράÏ.Ï.ε:  <ESC>   :wq   <ENTER>   για αÏ.οΞήκεÏ.Ï.η Ï.Ï.Îœ αλλαγÏ.Îœ.
+
+  4. Î.ια Μα ΎιαγράÏ.εÏ.ε έΜαΜ Ï.αρακÏ.ήρα κάÏ.Ï. αÏ.Ï. Ï.οΜ ΎροΌέα Ï.ε
+     Î.αΜοΜική Î.αÏ.άÏ.Ï.αÏ.η Ï.αÏ.ήÏ.Ï.ε:  x
+
+  5. Î.ια Μα ειÏ.άγεÏ.ε κείΌεΜο Ï.Ï.οΜ ΎροΌέα Ï.Ï.ο είÏ.Ï.ε Ï.ε Î.αΜοΜική Î.αÏ.άÏ.Ï.αÏ.η γράÏ.Ï.ε:
+         i     Ï.ληκÏ.ρολογήÏ.Ï.ε Ï.ο κείΌεΜο <ESC>
+
+ΣÎ.Î.Î.Î.ΩΣÎ.: ΠαÏ.Ï.ÎœÏ.αÏ. <ESC> Ξα Ï.οÏ.οΞεÏ.ηΞείÏ.ε Ï.Ï.ηΜ Î.αΜοΜική Î.αÏ.άÏ.Ï.αÏ.η ή Ξα
+          ακÏ.ρÏ.Ï.εÏ.ε Όία αΜεÏ.ιΞύΌηÏ.η και ΌερικÏ.Ï. ολοκληρÏ.ΌέΜη εΜÏ.ολή.
+
+΀Ï.ρα Ï.Ï.ΜεÏ.ίÏ.Ï.ε Όε Ï.ο Î.άΞηΌα 2.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                         Î.άΞηΌα 2.1: Î.Ν΀Î.Î.Î.Σ Î.Î.Î.Î.ΡÎ.ΊÎ.Σ
+
+         ** Î.ράÏ.Ï.ε  dw  για Μα ΎιαγράÏ.εÏ.ε ΌέÏ.ρι Ï.ο Ï.έλοÏ. ΌίαÏ. λέΟηÏ.. **
+
+  1. ΠαÏ.ήÏ.Ï.ε  <ESC>  για Μα βεβαιÏ.ΞείÏ.ε Ï.Ï.ι είÏ.Ï.ε Ï.Ï.ηΜ Î.αΜοΜική Î.αÏ.άÏ.Ï.αÏ.η.
+
+  2. Î.εÏ.ακιΜείÏ.Ï.ε Ï.οΜ ΎροΌέα Ï.Ï.ηΜ Ï.αρακάÏ.Ï. γραΌΌή Ï.ηΌειÏ.ΌέΜη Όε --->.
+
+  3. ΠηγαίΜεÏ.ε Ï.οΜ ΎροΌέα Ï.Ï.ηΜ αρÏ.ή Ï.ηÏ. λέΟηÏ. Ï.οÏ. Ï.ρέÏ.ει Μα ΎιαγραÏ.εί.
+
+  4. Î.ράÏ.Ï.ε  dw  για Μα κάΜεÏ.ε Ï.ηΜ λέΟη Μα εΟαÏ.αΜιÏ.Ï.εί.
+
+ΣÎ.Î.Î.Î.ΩΣÎ.: ΀α γράΌΌαÏ.α dw Ξα εΌÏ.αΜιÏ.Ï.ούΜ Ï.Ï.ηΜ Ï.ελεÏ.Ï.αία γραΌΌή Ï.ηÏ. οΞÏ.ΜηÏ. Ï.Ï.ο
+          Ï.α Ï.ληκÏ.ρολογείÏ.ε. Î.Îœ γράÏ.αÏ.ε κάÏ.ι λάΞοÏ., Ï.αÏ.ήÏ.Ï.ε  <ESC>  και
+          ΟεκιΜήÏ.Ï.ε αÏ.Ï. Ï.ηΜ αρÏ.ή.
+
+---> There are a some words fun that don't belong paper in this sentence.
+
+  5. Î.Ï.αΜαλάβεÏ.ε Ï.α βήΌαÏ.α 3 και 4 ΌέÏ.ρι η Ï.ρÏ.Ï.αÏ.η Μα είΜαι Ï.Ï.Ï.Ï.ή και
+     Ï.ηγαίΜεÏ.ε Ï.Ï.ο Î.άΞηΌα 2.2.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                   Î.άΞηΌα 2.2: Î Î.ΡÎ.ΣΣÎ.΀Î.ΡÎ.Σ Î.Ν΀Î.Î.Î.Σ Î.Î.Î.Î.ΡÎ.ΊÎ.Σ
+
+    ** ΠληκÏ.ρολογήÏ.Ï.ε  d$  για Μα ΎιαγράÏ.εÏ.ε ΌέÏ.ρι Ï.ο Ï.έλοÏ. Ï.ηÏ. γραΌΌήÏ.. **
+
+  1. ΠαÏ.ήÏ.Ï.ε  <ESC>  για Μα βεβαιÏ.ΞείÏ.ε Ï.Ï.ι είÏ.Ï.ε Ï.Ï.ηΜ Î.αΜοΜική Î.αÏ.άÏ.Ï.αÏ.η.
+
+  2. Î.εÏ.ακιΜείÏ.Ï.ε Ï.οΜ ΎροΌέα Ï.Ï.ηΜ Ï.αρακάÏ.Ï. γραΌΌή Ï.ηΌειÏ.ΌέΜη Όε --->.
+
+  3. Î.εÏ.ακιΜείÏ.Ï.ε Ï.οΜ ΎροΌέα Ï.Ï.ο Ï.έλοÏ. Ï.ηÏ. Ï.Ï.Ï.Ï.ήÏ. γραΌΌήÏ. (Î.Î.΀Î. Ï.ηΜ Ï.ρÏ.Ï.η . ).
+
+  4. ΠαÏ.ήÏ.Ï.ε   d$   για Μα ΎιαγράÏ.εÏ.ε ΌέÏ.ρι Ï.ο Ï.έλοÏ. Ï.ηÏ. γραΌΌήÏ..
+
+---> Somebody typed the end of this line twice. end of this line twice.
+
+  5. ΠηγαίΜεÏ.ε Ï.Ï.ο Î.άΞηΌα 2.3 για Μα καÏ.αλάβεÏ.ε Ï.ι Ï.Ï.ΌβαίΜει.
+
+
+
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                   Î.άΞηΌα 2.3: Î Î.ΡÎ. Î.Ν΀Î.Î.ΩΝ Î.Î.Î. Î.Ν΀Î.Î.Î.Î.Î.Î.ΝΩΝ
+
+
+Î. ΌορÏ.ή Ï.ηÏ. εΜÏ.ολήÏ. ΎιαγραÏ.ήÏ.  d  είΜαι Ï.Ï. εΟήÏ.:
+
+         [αριΞΌÏ.Ï.]   d   αΜÏ.ικείΌεΜο  Î.      d   [αριΞΌÏ.Ï.]   αΜÏ.ικείΌεΜο
+  Î.Ï.οÏ.:
+    αριΞΌÏ.Ï. - Ï.Ï.Ï.εÏ. Ï.ορέÏ. Ξα εκÏ.ελεÏ.Ï.εί η εΜÏ.ολή (Ï.ροαιρεÏ.ικÏ., εΟ' οριÏ.Όού=1).
+    d - η εΜÏ.ολή Ï.ηÏ. ΎιαγραÏ.ήÏ..
+    αΜÏ.ικείΌεΜο - Ï.άΜÏ. Ï.ε Ï.ι Ξα λειÏ.οÏ.ργήÏ.ει η εΜÏ.ολή (Ï.αρακάÏ.Ï. λίÏ.Ï.α).
+
+  Î.ία Όικρή λίÏ.Ï.α αÏ.Ï. αΜÏ.ικείΌεΜα:
+    w - αÏ.Ï. Ï.οΜ ΎροΌέα ΌέÏ.ρι Ï.ο Ï.έλοÏ. Ï.ηÏ. λέΟηÏ., Ï.εριλαΌβάΜοΜÏ.αÏ. Ï.ο ΎιάÏ.Ï.ηΌα.
+    e - αÏ.Ï. Ï.οΜ ΎροΌέα ΌέÏ.ρι Ï.ο Ï.έλοÏ. Ï.ηÏ. λέΟηÏ., ΧΩΡÎ.Σ Ï.ο ΎιάÏ.Ï.ηΌα.
+    $ - αÏ.Ï. Ï.οΜ ΎροΌέα ΌέÏ.ρι Ï.ο Ï.έλοÏ. Ï.ηÏ. γραΌΌήÏ..
+
+ΣÎ.Î.Î.Î.ΩΣÎ.:  Î.ια Ï.οÏ.Ï. Ï.ύÏ.οÏ.Ï. Ï.ηÏ. Ï.εριÏ.έÏ.ειαÏ., Ï.αÏ.Ï.ÎœÏ.αÏ. αÏ.λÏ.Ï. Ï.ο αΜÏ.ικείΌεΜο Ï.Ï.ο
+           είÏ.Ï.ε Ï.Ï.ηΜ Î.αΜοΜική Î.αÏ.άÏ.Ï.αÏ.η Ï.Ï.ρίÏ. κάÏ.οια εΜÏ.ολή Ξα ΌεÏ.ακιΜήÏ.εÏ.ε
+           Ï.οΜ ΎροΌέα Ï.Ï.Ï.Ï. καΞορίζεÏ.αι Ï.Ï.ηΜ λίÏ.Ï.α αΜÏ.ικειΌέΜÏ.Îœ.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+               Î.άΞηΌα 2.4: Î.Î.Î. Î.Î.Î.Î.ΡÎ.ΣÎ. Σ΀Î.Ν 'Î.Ν΀Î.Î.Î.-Î.Ν΀Î.Î.Î.Î.Î.Î.ΝÎ.'
+
+           ** ΠληκÏ.ρολογήÏ.Ï.ε  dd  για Μα ΎιαγράÏ.εÏ.ε Ï.λη Ï.η γραΌΌή. **
+
+  Î.ΟαιÏ.ίαÏ. Ï.ηÏ. Ï.Ï.Ï.ÎœÏ.Ï.ηÏ.αÏ. Ï.ηÏ. ΎιαγραÏ.ήÏ. ολÏ.κληρηÏ. γραΌΌήÏ., οι Ï.Ï.εΎιαÏ.Ï.έÏ.
+  Ï.οÏ. Vim αÏ.οÏ.άÏ.ιÏ.αΜ Ï.Ï.ι Ξα ήÏ.αΜ εÏ.κολÏ.Ï.ερο Μα γράÏ.εÏ.ε αÏ.λÏ.Ï. Ύύο d Ï.Ï.η
+  Ï.ειρά για Μα ΎιαγράÏ.εÏ.ε Όία γραΌΌή.
+
+  1. Î.εÏ.ακιΜείÏ.Ï.ε Ï.οΜ ΎροΌέα Ï.Ï.η ΎεύÏ.ερη γραΌΌή Ï.ηÏ. Ï.αρακάÏ.Ï. Ï.ράÏ.ηÏ..
+  2. Î.ράÏ.Ï.ε  dd  για Μα ΎιαγράÏ.εÏ.ε Ï.η γραΌΌή.
+  3. ΀Ï.ρα ΌεÏ.ακιΜηΞείÏ.ε Ï.Ï.ηΜ Ï.έÏ.αρÏ.η γραΌΌή.
+  4. Î.ράÏ.Ï.ε  2dd  (ΞÏ.ΌηΞείÏ.ε  αριΞΌÏ.Ï.-εΜÏ.ολή-αΜÏ.ικείΌεΜο) για Μα
+     ΎιαγράÏ.εÏ.ε Ύύο γραΌΌέÏ..
+
+      1)  Roses are red,
+      2)  Mud is fun,
+      3)  Violets are blue,
+      4)  I have a car,
+      5)  Clocks tell time,
+      6)  Sugar is sweet
+      7)  And so are you.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                         Î.άΞηΌα 2.5: Î. Î.Ν΀Î.Î.Î. Î.ΝÎ.Î.ΡÎ.ΣÎ.Σ
+
+            ** ΠαÏ.ήÏ.Ï.ε  u  για Μα αΜαιρέÏ.εÏ.ε Ï.ιÏ. Ï.ελεÏ.Ï.αίεÏ. εΜÏ.ολέÏ.,
+               U για Μα ΎιορΞÏ.Ï.εÏ.ε Ï.λη Ï.η γραΌΌή. **
+
+  1. Î.εÏ.ακιΜείÏ.Ï.ε Ï.οΜ ΎροΌέα Ï.Ï.ηΜ Ï.αρακάÏ.Ï. γραΌΌή Ï.ηΌειÏ.ΌέΜη Όε ---> και
+     Ï.οÏ.οΞεÏ.ήÏ.Ï.ε Ï.οΜ Ï.άΜÏ. Ï.Ï.ο Ï.ρÏ.Ï.ο λάΞοÏ..
+  2. ΠαÏ.ήÏ.Ï.ε  x  για Μα ΎιαγράÏ.εÏ.ε Ï.οΜ Ï.ρÏ.Ï.ο αΜεÏ.ιΞύΌηÏ.ο Ï.αρακÏ.ήρα.
+  3. ΀Ï.ρα Ï.αÏ.ήÏ.Ï.ε  u  για Μα αΜαιρέÏ.εÏ.ε Ï.ηΜ Ï.ελεÏ.Ï.αία εκÏ.ελεÏ.ΌέΜη εΜÏ.ολή.
+  4. Î.Ï.Ï.ή Ï.η Ï.ορά ΎιορΞÏ.Ï.Ï.ε Ï.λα Ï.α λάΞη Ï.Ï.η γραΌΌή Ï.ρηÏ.ιΌοÏ.οιÏ.ÎœÏ.αÏ. Ï.ηΜ εΜÏ.ολή x.
+  5. ΀Ï.ρα Ï.αÏ.ήÏ.Ï.ε έΜα κεÏ.αλαίο  U  για Μα εÏ.ιÏ.Ï.ρέÏ.εÏ.ε Ï.η γραΌΌή Ï.Ï.ηΜ αρÏ.ική
+     Ï.ηÏ. καÏ.άÏ.Ï.αÏ.η.
+  6. ΀Ï.ρα Ï.αÏ.ήÏ.Ï.ε  u  ΌερικέÏ. Ï.ορέÏ. για Μα αΜαιρέÏ.εÏ.ε Ï.ηΜ  U  και
+     Ï.ροηγούΌεΜεÏ. εΜÏ.ολέÏ..
+  7. ΀Ï.ρα Ï.αÏ.ήÏ.Ï.ε CTRL-R (κραÏ.Ï.ÎœÏ.αÏ. Ï.αÏ.ηΌέΜο Ï.ο Ï.λήκÏ.ρο CTRL καΞÏ.Ï. Ï.αÏ.άÏ.ε Ï.ο R)
+     ΌερικέÏ. Ï.ορέÏ. για Μα εÏ.αΜαÏ.έρεÏ.ε Ï.ιÏ. εΜÏ.ολέÏ. (αΜαίρεÏ.η Ï.Ï.Îœ αΜαιρέÏ.εÏ.Îœ).
+
+---> Fiix the errors oon thhis line and reeplace them witth undo.
+
+  8. Î.Ï.Ï.έÏ. είΜαι Ï.ολύ Ï.ρήÏ.ιΌεÏ. εΜÏ.ολέÏ..  ΀Ï.ρα Ï.ηγαίΜεÏ.ε Ï.Ï.ηΜ
+     ΠερίληÏ.η Ï.οÏ. Î.αΞήΌαÏ.οÏ. 2.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                               Î.Î.Î.Î.Î.Î. 2 Î Î.ΡÎ.Î.Î.ΚÎ.
+
+
+  1. Î.ια Μα ΎιαγράÏ.εÏ.ε αÏ.Ï. Ï.οΜ ΎροΌέα ΌέÏ.ρι Ï.ο Ï.έλοÏ. λέΟηÏ. γράÏ.Ï.ε:      dw
+
+  2. Î.ια Μα ΎιαγράÏ.εÏ.ε αÏ.Ï. Ï.οΜ ΎροΌέα ΌέÏ.ρι Ï.ο Ï.έλοÏ. γραΌΌήÏ. γράÏ.Ï.ε:    d$
+
+  3. Î.ια Μα ΎιαγράÏ.εÏ.ε ολÏ.κληρη Ï.η γραΌΌή γράÏ.Ï.ε:    dd
+
+  4. Î. ΌορÏ.ή για Όία εΜÏ.ολή Ï.Ï.ηΜ Î.αΜοΜική Î.αÏ.άÏ.Ï.αÏ.η είΜαι:
+
+      [αριΞΌÏ.Ï.]   εΜÏ.ολή   αΜÏ.ικείΌεΜο    Î.    εΜÏ.ολή   [αριΞΌÏ.Ï.]   αΜÏ.ικείΌεΜο
+     Ï.Ï.οÏ.:
+       αριΞΌÏ.Ï. - Ï.Ï.Ï.εÏ. Ï.ορέÏ. Μα εÏ.αΜαληÏ.Ξεί η εΜÏ.ολή
+       εΜÏ.ολή - Ï.ι Μα γίΜει, Ï.Ï.Ï.Ï. η  d  για ΎιαγραÏ.ή
+       αΜÏ.ικείΌεΜο - Ï.άΜÏ. Ï.ε Ï.ι Μα εΜεργήÏ.ει η εΜÏ.ολή, Ï.Ï.Ï.Ï.  w  (λέΟη),
+                     $ (Ï.έλοÏ. Ï.ηÏ. γραΌΌήÏ.), κÏ.λ.
+
+  5. Î.ια Μα αΜαιρέÏ.εÏ.ε Ï.ροηγούΌεΜεÏ. εΜέργειεÏ., Ï.αÏ.ήÏ.Ï.ε:        u   (Ï.εζÏ. u)
+     Î.ια Μα αΜαιρέÏ.εÏ.ε Ï.λεÏ. Ï.ιÏ. αλλαγέÏ. Ï.Ï.η γραΌΌή, Ï.αÏ.ήÏ.Ï.ε:  U  (κεÏ.αλαίο U)
+     Î.ια Μα αΜαιρέÏ.εÏ.ε Ï.ιÏ. αΜαιρέÏ.ειÏ., Ï.αÏ.ήÏ.Ï.ε:               CTRL-R
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        Î.άΞηΌα 3.1: Î. Î.Ν΀Î.Î.Î. ΀Î.Î Î.Î.Î.΀Î.ΣÎ.Σ
+
+
+  ** ΠαÏ.ήÏ.Ï.ε  p  για Μα Ï.οÏ.οΞεÏ.ήÏ.εÏ.ε Ï.ηΜ Ï.ελεÏ.Ï.αία ΎιαγραÏ.ή ΌεÏ.ά Ï.οΜ ΎροΌέα.  **
+
+  1. Î.εÏ.ακιΜείÏ.Ï.ε Ï.οΜ ΎροΌέα Ï.Ï.ηΜ Ï.ρÏ.Ï.η γραΌΌή Ï.ηÏ. Ï.αρακάÏ.Ï. οΌάΎαÏ..
+
+  2. ΠαÏ.ήÏ.Ï.ε  dd  για Μα ΎιαγράÏ.εÏ.ε Ï.η γραΌΌή και Μα Ï.ηΜ αÏ.οΞηκεύÏ.εÏ.ε Ï.ε
+     Ï.ροÏ.Ï.ριΜή ΌΜήΌη Ï.οÏ. Vim.
+
+  3. Î.εÏ.ακιΜείÏ.Ï.ε Ï.οΜ ΎροΌέα Ï.Ï.η γραΌΌή Î Î.ΝΩ αÏ.Ï. εκεί Ï.οÏ. Ξα Ï.ρέÏ.ει Μα Ï.άει
+     η ΎιαγραΌΌέΜη γραΌΌή.
+
+  4. Î.Ï.ο είÏ.Ï.ε Ï.ε Î.αΜοΜική Î.αÏ.άÏ.Ï.αÏ.η, Ï.αÏ.ήÏ.Ï.ε  p  για Μα βάλεÏ.ε Ï.η γραΌΌή.
+
+  5. Î.Ï.αΜαλάβεÏ.ε Ï.α βήΌαÏ.α 2 έÏ.Ï. 4 για Μα βάλεÏ.ε Ï.λεÏ. Ï.ιÏ. γραΌΌέÏ. Ï.Ï.η
+     Ï.Ï.Ï.Ï.ή Ï.ειρά.
+
+     d) Can you learn too?
+     b) Violets are blue,
+     c) Intelligence is learned,
+     a) Roses are red,
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                      Î.άΞηΌα 3.2: Î. Î.Ν΀Î.Î.Î. Î.Ν΀Î.Î.Î.΀Î.Σ΀Î.ΣÎ.Σ
+
+
+    ** ΠαÏ.ήÏ.Ï.ε  r  και Ï.αρακÏ.ήρα για Μα αλλάΟεÏ.ε αÏ.Ï.Ï.Îœ Ï.οÏ. είΜαι
+       κάÏ.Ï. αÏ.Ï. Ï.οΜ ΎροΌέα. **
+
+  1. Î.εÏ.ακιΜείÏ.Ï.ε Ï.οΜ ΎροΌέα Ï.Ï.ηΜ Ï.ρÏ.Ï.η γραΌΌή Ï.αρακάÏ.Ï. Ï.ηΌειÏ.ΌέΜη Όε --->.
+
+  2. Î.εÏ.ακιΜείÏ.Ï.ε Ï.οΜ ΎροΌέα έÏ.Ï.ι Ï.Ï.Ï.ε Μα είΜαι Ï.άΜÏ. Ï.Ï.ο Ï.ρÏ.Ï.ο λάΞοÏ..
+
+  3. ΠαÏ.ήÏ.Ï.ε  r  και ΌεÏ.ά Ï.οΜ Ï.αρακÏ.ήρα ο οÏ.οίοÏ. ΎιορΞÏ.Μει Ï.ο λάΞοÏ..
+
+  4. Î.Ï.αΜαλάβεÏ.ε Ï.α βήΌαÏ.α 2 και 3 ΌέÏ.ρι Μα είΜαι Ï.Ï.Ï.Ï.ή η Ï.ρÏ.Ï.η γραΌΌή.
+
+--->  Whan this lime was tuoed in, someone presswd some wrojg keys!
+--->  When this line was typed in, someone pressed some wrong keys!
+
+  5. ΀Ï.ρα Ï.ηγαίΜεÏ.ε Ï.Ï.ο Î.άΞηΌα 3.2.
+
+ΣÎ.Î.Î.Î.ΩΣÎ.: Να ΞÏ.ΌάÏ.Ï.ε Ï.Ï.ι Ï.ρέÏ.ει Μα ΌαΞαίΜεÏ.ε Όε Ï.η Ï.ρήÏ.η, και Ï.Ï.ι Όε
+          Ï.ηΜ αÏ.οΌΜηΌÏ.ΜεÏ.Ï.η.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                          Î.άΞηΌα 3.3: Î. Î.Ν΀Î.Î.Î. Î.Î.Î.Î.Î.Î.Σ
+
+           ** Î.ια Μα αλλάΟεÏ.ε Ï.ΌήΌα ή Ï.λη Ï.η λέΟη, Ï.αÏ.ήÏ.Ï.ε  cw  . **
+
+  1. Î.εÏ.ακιΜείÏ.Ï.ε Ï.οΜ ΎροΌέα Ï.Ï.ηΜ Ï.ρÏ.Ï.η γραΌΌή Ï.αρακάÏ.Ï. Ï.ηΌειÏ.ΌέΜη Όε --->.
+
+  2. ΀οÏ.οΞεÏ.ήÏ.Ï.ε Ï.οΜ ΎροΌέα Ï.άΜÏ. Ï.Ï.ο u Ï.ηÏ. λέΟηÏ. lubw.
+
+  3. ΠαÏ.ήÏ.Ï.ε  cw  και Ï.η Ï.Ï.Ï.Ï.ή λέΟη (Ï.Ï.ηΜ Ï.ερίÏ.Ï.Ï.Ï.η αÏ.Ï.ή, γράÏ.Ï.ε  'ine'.)
+
+  4. ΠαÏ.ήÏ.Ï.ε <ESC> και Ï.ηγαίΜεÏ.ε Ï.Ï.ο εÏ.Ï.ΌεΜο λάΞοÏ. (Ï.Ï.οΜ Ï.ρÏ.Ï.ο
+     Ï.αρακÏ.ήρα Ï.ροÏ. αλλαγή).
+
+  5. Î.Ï.αΜαλάβεÏ.ε Ï.α βήΌαÏ.α 3 και 4 ΌέÏ.ριÏ. Ï.Ï.οÏ. η Ï.ρÏ.Ï.η Ï.ρÏ.Ï.αÏ.η Μα είΜαι
+     ίΎια Όε Ï.η ΎεύÏ.ερη.
+
+---> This lubw has a few wptfd that mrrf changing usf the change command.
+---> This line has a few words that need changing using the change command.
+
+ΠαραÏ.ηρείÏ.Ï.ε Ï.Ï.ι η  cw  Ï.Ï.ι ÎŒÏ.Μο αΜÏ.ικαΞιÏ.Ï.άει Ï.η λέΟη, αλλά Ï.αÏ. ειÏ.άγει
+εÏ.ίÏ.ηÏ. Ï.ε Ï.αρεΌβολή.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                     Î.άΞηΌα 3.4: Î Î.ΡÎ.ΣΣÎ.΀Î.ΡÎ.Σ Î.Î.Î.Î.Î.Î.Σ Î.Î. c
+
+
+  ** Î. εΜÏ.ολή αλλαγήÏ. Ï.ρηÏ.ιΌοÏ.οιείÏ.αι Όε Ï.α ίΎια αΜÏ.ικείΌεΜα Ï.ηÏ. ΎιαγραÏ.ήÏ.. **
+
+
+  1. Î. εΜÏ.ολή αλλαγήÏ. ΎοÏ.λεύει Όε Ï.οΜ ίΎιο Ï.ρÏ.Ï.ο Ï.Ï.Ï.Ï. η ΎιαγραÏ.ή. Î. ΌορÏ.ή είΜαι:
+
+       [αριΞΌÏ.Ï.]   c   αΜÏ.ικείΌεΜο     Î.     c   [αριΞΌÏ.Ï.]   αΜÏ.ικείΌεΜο
+
+  2. ΀α αΜÏ.ικείΌεΜα είΜαι Ï.άλι Ï.α ίΎια, Ï.Ï.Ï.Ï. w (λέΟη), $ (Ï.έλοÏ. γραΌΌήÏ.), κÏ.λ.
+
+  3. Î.εÏ.ακιΜηΞείÏ.ε Ï.Ï.ηΜ Ï.ρÏ.Ï.η γραΌΌή Ï.αρακάÏ.Ï. Ï.ηΌειÏ.ΌέΜη Όε --->.
+
+  4. Î.εÏ.ακιΜείÏ.Ï.ε Ï.οΜ ΎροΌέα Ï.Ï.ο Ï.ρÏ.Ï.ο λάΞοÏ..
+
+  5. Î.ράÏ.Ï.ε  c$  για Μα κάΜεÏ.ε Ï.ο Ï.Ï.Ï.λοιÏ.ο Ï.ηÏ. γραΌΌήÏ. ίΎιο Όε Ï.η ΎεύÏ.ερη
+     και Ï.αÏ.ήÏ.Ï.ε <ESC>.
+
+---> 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.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                               Î.Î.Î.Î.Î.Î. 3 Î Î.ΡÎ.Î.Î.ΚÎ.
+
+
+  1. Î.ια Μα Ï.οÏ.οΞεÏ.ήÏ.εÏ.ε κείΌεΜο Ï.οÏ. ÎŒÏ.λιÏ. έÏ.ει ΎιαγραÏ.εί, Ï.αÏ.ήÏ.Ï.ε  p .
+     Î.Ï.Ï.Ï. Ï.οÏ.οΞεÏ.εί Ï.ο ΎιαγραΌΌέΜο κείΌεΜο Î.Î.΀Î. Ï.οΜ ΎροΌέα (αΜ ΎιαγράÏ.Ï.ηκε
+     γραΌΌή Ξα Ï.άει ΌεÏ.ά Ï.Ï.η γραΌΌή κάÏ.Ï. αÏ.Ï. Ï.οΜ ΎροΌέα.
+
+  2. Î.ια Μα αΜÏ.ικαÏ.αÏ.Ï.ήÏ.εÏ.ε Ï.οΜ Ï.αρακÏ.ήρα κάÏ.Ï. αÏ.Ï. Ï.οΜ ΎροΌέα, Ï.αÏ.ήÏ.Ï.ε  r
+     και ΌεÏ.ά Ï.οΜ Ï.αρακÏ.ήρα Ï.οÏ. Ξα αΜÏ.ικαÏ.αÏ.Ï.ήÏ.ει Ï.οΜ αρÏ.ικÏ..
+
+  3. Î. εΜÏ.ολή αλλαγήÏ. Ï.αÏ. εÏ.ιÏ.ρέÏ.ει Μα αλλάΟεÏ.ε Ï.ο καΞοριÏ.ΌέΜο αΜÏ.ικείΌεΜο
+     αÏ.Ï. Ï.οΜ ΎροΌέα ΌέÏ.ρι Ï.ο Ï.έλοÏ. Ï.οÏ. αΜÏ.ικείΌεΜο. Î .Ï.. γράÏ.Ï.ε  cw  για Μα
+     αλλάΟεÏ.ε αÏ.Ï. Ï.οΜ ΎροΌέα ΌέÏ.ρι Ï.ο Ï.έλοÏ. Ï.ηÏ. λέΟηÏ., c$ για Μα αλλάΟεÏ.ε
+     ΌέÏ.ρι Ï.ο Ï.έλοÏ. γραΌΌήÏ..
+
+  4. Î. ΌορÏ.ή για Ï.ηΜ αλλαγή είΜαι:
+
+         [αριΞΌÏ.Ï.]   c   αΜÏ.ικείΌεΜο     Î.     c   [αριΞΌÏ.Ï.]   αΜÏ.ικείΌεΜο
+
+΀Ï.ρα Ï.Ï.ΜεÏ.ίÏ.Ï.ε Όε Ï.ο εÏ.Ï.ΌεΜο ΌάΞηΌα.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                     Î.άΞηΌα 4.1: Î.Î.ΣÎ. Î.Î.Î. Î.Î.΀Î.Σ΀Î.ΣÎ. Î.ΡΧÎ.Î.Î.Î¥
+
+
+ ** ΠαÏ.ήÏ.Ï.ε CTRL-g για Μα εΌÏ.αΜιÏ.Ï.εί η ΞέÏ.η Ï.αÏ. Ï.Ï.ο αρÏ.είο και η καÏ.άÏ.Ï.αÏ.ή Ï.οÏ..
+    ΠαÏ.ήÏ.Ï.ε SHIFT-G για Μα Ï.άÏ.ε Ï.ε Όία γραΌΌή Ï.Ï.ο αρÏ.είο. **
+
+  ΣηΌείÏ.Ï.η: Î.ιαβάÏ.Ï.ε ολÏ.κληρο Ï.ο ΌάΞηΌα Ï.ριΜ εκÏ.ελέÏ.εÏ.ε κάÏ.οιο αÏ.Ï. Ï.α βήΌαÏ.α!!
+
+  1. Î.ραÏ.ήÏ.Ï.ε Ï.αÏ.ηΌέΜο Ï.ο Ï.λήκÏ.ρο Ctrl και Ï.αÏ.ήÏ.Ï.ε  g . Î.ία γραΌΌή καÏ.άÏ.Ï.αÏ.ηÏ.
+     Ξα εΌÏ.αΜιÏ.Ï.εί Ï.Ï.ο κάÏ.Ï. ΌέροÏ. Ï.ηÏ. Ï.ελίΎαÏ. Όε Ï.ο Ï.ΜοΌα αρÏ.είοÏ. και Ï.η
+     γραΌΌή Ï.οÏ. είÏ.Ï.ε. Î.Ï.ΌηΞείÏ.ε Ï.οΜ αριΞΌÏ. γραΌΌήÏ. για Ï.ο Î.ήΌα 3.
+
+  2. ΠαÏ.ήÏ.Ï.ε shift-G για Μα ΌεÏ.ακιΜηΞείÏ.ε Ï.Ï.ο Ï.έλοÏ. Ï.οÏ. αρÏ.είοÏ..
+
+  3. ΠαÏ.ήÏ.Ï.ε Ï.οΜ αριΞΌÏ. Ï.ηÏ. γραΌΌήÏ. Ï.οÏ. ήÏ.αÏ.Ï.αΜ και ΌεÏ.ά shift-G. Î.Ï.Ï.Ï. Ξα
+     Ï.αÏ. εÏ.ιÏ.Ï.ρέÏ.ει Ï.Ï.η γραΌΌή Ï.οÏ. ήÏ.αÏ.Ï.αΜ Ï.ριΜ Ï.αÏ.ήÏ.εÏ.ε για Ï.ρÏ.Ï.η Ï.ορά Ctrl-g.
+     (Î.Ï.αΜ Ï.ληκÏ.ρολογείÏ.ε Ï.οÏ.Ï. αριΞΌούÏ., Î.Î.Ν Ξα εΌÏ.αΜίζοΜÏ.αι Ï.Ï.ηΜ οΞÏ.Μη).
+
+  4. Î.Îœ ΜοιÏ.ΞεÏ.ε Ï.ίγοÏ.ροÏ. για αÏ.Ï.Ï., εκÏ.ελέÏ.Ï.ε Ï.α βήΌαÏ.α 1 έÏ.Ï. 3.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        Î.άΞηΌα 4.2: Î. Î.Ν΀Î.Î.Î. Î.ΝÎ.Î.Î.΀Î.ΣÎ.Σ
+
+
+          ** ΠαÏ.ήÏ.Ï.ε   /   ακολοÏ.ΞούΌεΜο αÏ.Ï. Ï.η Ï.ράÏ.η Ï.οÏ. Ï.άÏ.ΜεÏ.ε. **
+
+  1. Σε Î.αΜοΜική Î.αÏ.άÏ.Ï.αÏ.η Ï.αÏ.ήÏ.Ï.ε Ï.οΜ Ï.αρακÏ.ήρα  / . ΠαραÏ.ηρήÏ.Ï.ε Ï.Ï.ι αÏ.Ï.Ï.Ï. και
+     ο ΎροΌέαÏ. εΌÏ.αΜίζοΜÏ.αι Ï.Ï.ο κάÏ.Ï. ΌέροÏ. Ï.ηÏ. οΞÏ.ΜηÏ. Ï.Ï.Ï.Ï. Όε Ï.ηΜ εΜÏ.ολή  : .
+
+  2. ΀Ï.ρα γράÏ.Ï.ε 'errroor' <ENTER>. Î.Ï.Ï.ή είΜαι η λέΟη Ï.οÏ. ΞέλεÏ.ε Μα Ï.άΟεÏ.ε.
+
+  3. Î.ια Μα Ï.άΟεÏ.ε ΟαΜά για Ï.ηΜ ίΎια Ï.ράÏ.η, Ï.αÏ.ήÏ.Ï.ε αÏ.λÏ.Ï.  n .
+     Î.ια Μα Ï.άΟεÏ.ε Ï.ηΜ ίΎια Ï.ράÏ.η Ï.Ï.ηΜ αΜÏ.ίΞεÏ.η καÏ.εύΞÏ.ÎœÏ.η, Ï.αÏ.ήÏ.Ï.ε  Shift-N .
+
+  4. Î.Îœ ΞέλεÏ.ε Μα Ï.άΟεÏ.ε για Όία Ï.ράÏ.η Ï.ροÏ. Ï.α Ï.ίÏ.Ï., Ï.ρηÏ.ιΌοÏ.οιήÏ.Ï.ε Ï.ηΜ εΜÏ.ολή  ?  αΜÏ.ί Ï.ηÏ.  / .
+
+---> Î.Ï.αΜ η αΜαζήÏ.ηÏ.η Ï.Ï.άÏ.ει Ï.Ï.ο Ï.έλοÏ. Ï.οÏ. αρÏ.είοÏ. Ξα Ï.Ï.ΜεÏ.ίÏ.ει αÏ.Ï. Ï.ηΜ αρÏ.ή.
+
+  "errroor" is not the way to spell error;  errroor is an error.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                   Î.άΞηΌα 4.3: Î.ΥΡÎ.ΣÎ. ΀Î.Î.ΡÎ.Î.Σ΀ΩΝ Î Î.ΡÎ.ΝÎ.Î.ΣÎ.ΩΝ
+
+
+          ** ΠαÏ.ήÏ.Ï.ε   %   για Μα βρείÏ.ε Ï.ηΜ αΜÏ.ίÏ.Ï.οιÏ.η ), ], ή } . **
+
+  1. ΀οÏ.οΞεÏ.ήÏ.Ï.ε Ï.οΜ ΎροΌέα Ï.ε κάÏ.οια (, [, ή { Ï.Ï.ηΜ Ï.αρακάÏ.Ï. γραΌΌή
+     Ï.ηΌειÏ.ΌέΜη Όε --->.
+
+  2. ΀Ï.ρα Ï.αÏ.ήÏ.Ï.ε Ï.οΜ Ï.αρακÏ.ήρα  % .
+
+  3. Î. ΎροΌέαÏ. Ξα Ï.ρέÏ.ει Μα είΜαι Ï.Ï.ηΜ αΜÏ.ίÏ.Ï.οιÏ.η Ï.αρέΜΞεÏ.η ή αγκύλη.
+
+  4. ΠαÏ.ήÏ.Ï.ε  %  για Μα ΌεÏ.ακιΜήÏ.εÏ.ε Ï.οΜ ΎροΌέα Ï.ίÏ.Ï. Ï.Ï.ηΜ Ï.ρÏ.Ï.η αγκύλη
+    (Ï.οÏ. ζεÏ.γαριού).
+
+---> This ( is a test line with ('s, ['s ] and {'s } in it. ))
+
+ΣÎ.Î.Î.Î.ΩΣÎ.: Î.Ï.Ï.Ï. είΜαι Ï.ολύ Ï.ρήÏ.ιΌο Ï.Ï.ηΜ αÏ.οÏ.Ï.αλΌάÏ.Ï.Ï.η εΜÏ.Ï. Ï.ρογράΌΌαÏ.οÏ.
+          Όε Όη Ï.αιριαÏ.Ï.έÏ. Ï.αρεΜΞέÏ.ειÏ.!
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    Î.άΞηΌα 4.4: Î.ΝÎ.Σ ΀ΡÎ.Î Î.Σ Î.Î.Î. Î.Î.Î.Î.Î.Î. Î.Î.Î.ΩΝ
+
+
+       ** Î.ράÏ.Ï.ε  :s/old/new/g  για Μα αλλάΟεÏ.ε Ï.ο 'new' Όε Ï.ο 'old'. **
+
+  1. Î.εÏ.ακιΜείÏ.Ï.ε Ï.οΜ ΎροΌέα Ï.Ï.ηΜ Ï.αρακάÏ.Ï. γραΌΌή Ï.ηΌειÏ.ΌέΜη Όε --->.
+
+  2. Î.ράÏ.Ï.ε  :s/thee/the <ENTER> . ΣηΌειÏ.Ï.Ï.ε Ï.Ï.ι αÏ.Ï.ή η εΜÏ.ολή αλλάζει ÎŒÏ.Μο
+     Ï.ηΜ Ï.ρÏ.Ï.η εΌÏ.άΜιÏ.η Ï.Ï.η γραΌΌή.
+
+  3. ΀Ï.ρα γράÏ.Ï.ε   :s/thee/the/g    εΜΜοÏ.ÎœÏ.αÏ. γεΜική αΜÏ.ικαÏ.άÏ.Ï.αÏ.η Ï.Ï.η
+     γραΌΌή. Î.Ï.Ï.Ï. αλλάζει Ï.λεÏ. Ï.ιÏ. εΌÏ.αΜίÏ.ειÏ. εÏ.ί Ï.ηÏ. γραΌΌήÏ..
+
+---> thee best time to see thee flowers is in thee spring.
+
+  4. Î.ια Μα αλλάΟεÏ.ε κάΞε εΌÏ.άΜιÏ.η ΌίαÏ. Ï.Ï.ΌβολοÏ.ειράÏ. ΌεÏ.αΟύ Ύύο γραΌΌÏ.Îœ,
+     γράÏ.Ï.ε   :#,#s/old/new/g   Ï.Ï.οÏ. #,# οι αριΞΌοί Ï.Ï.Îœ Ύύο γραΌΌÏ.Îœ.
+     Î.ράÏ.Ï.ε   :%s/old/new/g     για Μα αλλάΟεÏ.ε κάΞε εΌÏ.άΜιÏ.η Ï.ε Ï.λο Ï.ο αρÏ.είο.
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                               Î.Î.Î.Î.Î.Î. 4 Î Î.ΡÎ.Î.Î.ΚÎ.
+
+
+  1. ΀ο  Ctrl-g  εΌÏ.αΜίζει Ï.η ΞέÏ.η Ï.αÏ. Ï.Ï.ο αρÏ.είο και Ï.ηΜ καÏ.άÏ.Ï.αÏ.ή Ï.οÏ..
+     ΀ο  Shift-G  Ï.ηγαίΜει Ï.Ï.ο Ï.έλοÏ. Ï.οÏ. αρÏ.είοÏ.. Î.ΜαÏ. αριΞΌÏ.Ï. γραΌΌήÏ.
+     ακολοÏ.ΞούΌεΜοÏ. αÏ.Ï.  Shift-G  Ï.ηγαίΜει Ï.ε εκείΜη Ï.η γραΌΌή.
+
+  2. Î.ράÏ.οΜÏ.αÏ.  /  ακολοÏ.ΞούΌεΜο αÏ.Ï. Όία Ï.ράÏ.η Ï.άÏ.Μει Ï.ροÏ. Ï.α Î.ΠΡÎ.Σ΀Î. για
+     Ï.η Ï.ράÏ.η. Î.ράÏ.οΜÏ.αÏ.  ?  ακολοÏ.ΞούΌεΜο αÏ.Ï. Όία Ï.ράÏ.η Ï.άÏ.Μει Ï.ροÏ. Ï.α Î Î.ΣΩ
+     για Ï.η Ï.ράÏ.η. Î.εÏ.ά αÏ.Ï. Όία αΜαζήÏ.ηÏ.η Ï.αÏ.ήÏ.Ï.ε  n  για Μα βρείÏ.ε Ï.ηΜ
+     εÏ.Ï.ΌεΜη εΌÏ.άΜιÏ.η Ï.ροÏ. Ï.ηΜ ίΎια καÏ.εύΞÏ.ÎœÏ.η ή  Shift-N  για Μα Ï.άΟεÏ.ε
+     Ï.ροÏ. Ï.ηΜ αΜÏ.ίΞεÏ.η καÏ.εύΞÏ.ÎœÏ.η.
+
+  3. ΠαÏ.Ï.ÎœÏ.αÏ.  %  Ï.Ï.ο ο ΎροΌέαÏ. είΜαι Ï.άΜÏ. Ï.ε Όία (,),[,],{, ή }  εΜÏ.οÏ.ίζει
+     Ï.ο αΜÏ.ίÏ.Ï.οιÏ.ο Ï.αίρι Ï.οÏ. ζεÏ.γαριού.
+
+  4. Î.ια αΜÏ.ικαÏ.άÏ.Ï.αÏ.η Όε new Ï.οÏ. Ï.ρÏ.Ï.οÏ. old Ï.Ï.η γραΌΌή γράÏ.Ï.ε  :s/old/new
+     Î.ια αΜÏ.ικαÏ.άÏ.Ï.αÏ.η Όε new Ï.λÏ.Îœ Ï.Ï.Îœ 'old' Ï.Ï.η γραΌΌή γράÏ.Ï.ε  :s/old/new/g
+     Î.ια αΜÏ.ικαÏ.άÏ.Ï.αÏ.η Ï.ράÏ.εÏ.Îœ ΌεÏ.αΟύ Ύύο # γραΌΌÏ.Îœ γράÏ.Ï.ε      :#,#s/old/new/g
+     Î.ια αΜÏ.ικαÏ.άÏ.Ï.αÏ.η Ï.λÏ.Îœ Ï.Ï.Îœ εΌÏ.αΜίÏ.εÏ.Îœ Ï.Ï.ο αρÏ.είο γράÏ.Ï.ε    :%s/old/new/g
+     Î.ια ερÏ.Ï.ηÏ.η εÏ.ιβεβαίÏ.Ï.ηÏ. κάΞε Ï.ορά Ï.ροÏ.ΞέÏ.Ï.ε έΜα 'c'       "%s/old/new/gc
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                  Î.άΞηΌα 5.1: ΠΩΣ Î.Î.΀Î.Î.Ω Î.Î.Î. Î.Î.Ω΀Î.ΡÎ.Î.Î. Î.Ν΀Î.Î.Î.
+
+
+** Î.ράÏ.Ï.ε  :!  ακολοÏ.ΞούΌεΜο αÏ.Ï. Όία εΟÏ.Ï.ερική εΜÏ.ολή για Μα Ï.ηΜ εκÏ.ελέÏ.εÏ.ε. **
+
+  1. ΠαÏ.ήÏ.Ï.ε Ï.ηΜ οικεία εΜÏ.ολή  :  για Μα ΞέÏ.εÏ.ε Ï.οΜ ΎροΌέα Ï.Ï.ο κάÏ.Ï. ΌέροÏ.
+     Ï.ηÏ. οΞÏ.ΜηÏ.. Î.Ï.Ï.Ï. Ï.αÏ. εÏ.ιÏ.ρέÏ.ει Μα ÎŽÏ.Ï.εÏ.ε Όία εΜÏ.ολή.
+
+  2. ΀Ï.ρα Ï.αÏ.ήÏ.Ï.ε  Ï.ο  !  (ΞαÏ.ΌαÏ.Ï.ικÏ.). Î.Ï.Ï.Ï. Ï.αÏ. εÏ.ιÏ.ρέÏ.ει Μα εκÏ.ελέÏ.εÏ.ε
+     οÏ.οιαΎήÏ.οÏ.ε εΟÏ.Ï.ερική εΜÏ.ολή Ï.οÏ. Ï.λοιού.
+
+  3. ΣαΜ Ï.αράΎειγΌα γράÏ.Ï.ε  ls  ΌεÏ.ά αÏ.Ï. Ï.ο ! και Ï.αÏ.ήÏ.Ï.ε <ENTER>. Î.Ï.Ï.Ï. Ξα
+     Ï.αÏ. εΌÏ.αΜίÏ.ει Όία λίÏ.Ï.α Ï.οÏ. καÏ.αλÏ.γοÏ. Ï.αÏ., ακριβÏ.Ï. Ï.αΜ Μα ήÏ.αÏ.Ï.αΜ Ï.Ï.ηΜ
+     Ï.ροÏ.ροÏ.ή Ï.οÏ. Ï.λοιού. Î. Ï.ρηÏ.ιΌοÏ.οιήÏ.Ï.ε  :!dir  αΜ Ï.ο ls ΎεΜ ΎοÏ.λεύει.
+
+---> ΣηΌείÏ.Ï.η: Î.ίΜαι ÎŽÏ.ΜαÏ.Ï.Îœ Μα εκÏ.ελέÏ.εÏ.ε οÏ.οιαΎήÏ.οÏ.ε εΟÏ.Ï.ερική εΜÏ.ολή
+     Όε αÏ.Ï.Ï.Îœ Ï.οΜ Ï.ρÏ.Ï.ο.
+
+---> ΣηΌείÏ.Ï.η: Î.λεÏ. οι εΜÏ.ολέÏ.  :  Ï.ρέÏ.ει Μα Ï.ερΌαÏ.ίζοΜÏ.αι Ï.αÏ.Ï.ÎœÏ.αÏ. Ï.ο <ENTER>.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                 Î.άΞηΌα 5.2: Î Î.ΡÎ.ΣΣÎ.΀Î.ΡÎ. Î Î.ΡÎ. Î.Î.Î.ΡÎ.ΊÎ.Σ Î.ΡΧÎ.Î.ΩΝ
+
+
+   ** Î.ια Μα Ï.Ï.Ï.εÏ.ε Ï.ιÏ. αλλάγεÏ. Ï.οÏ. κάΜαÏ.ε Ï.Ï.ο αρÏ.είο, γράÏ.Ï.ε  :w Î.ΡΧÎ.Î.Î..  **
+
+  1. Î.ράÏ.Ï.ε  :!dir  ή  :!ls  για Μα Ï.άρεÏ.ε Όία λίÏ.Ï.α Ï.οÏ. καÏ.αλÏ.γοÏ. Ï.αÏ..
+     Î.Ύη ΟέρεÏ.ε Ï.Ï.ι Ï.ρέÏ.ει Μα Ï.αÏ.ήÏ.εÏ.ε <ENTER> ΌεÏ.ά αÏ.Ï. αÏ.Ï.Ï..
+
+  2. Î.ιαλέΟÏ.ε έΜα Ï.ΜοΌα αρÏ.είοÏ. Ï.οÏ. ΎεΜ Ï.Ï.άρÏ.ει ακÏ.Όα, Ï.Ï.Ï.Ï. Ï.ο TEST.
+
+  3. ΀Ï.ρα γράÏ.Ï.ε:  :w TEST  (Ï.Ï.οÏ. TEST είΜαι Ï.ο Ï.ΜοΌα αρÏ.είοÏ. Ï.οÏ. ΎιαλέΟαÏ.ε).
+
+  4. Î.Ï.Ï.Ï. Ï.Ï.ζει Ï.λο Ï.ο αρÏ.είο (vim Tutor) Όε Ï.ο Ï.ΜοΌα TEST. Î.ια Μα Ï.ο
+     εÏ.αληΞεύÏ.εÏ.ε, γράÏ.Ï.ε ΟαΜά  :!dir για Μα ΎείÏ.ε Ï.οΜ καÏ.άλογÏ. Ï.αÏ..
+
+---> ΣηΌειÏ.Ï.Ï.ε Ï.Ï.ι αΜ βγαίΜαÏ.ε αÏ.Ï. Ï.οΜ Vim και ÎŒÏ.αίΜαÏ.ε ΟαΜά Όε Ï.ο Ï.ΜοΌα
+     αρÏ.είοÏ. TEST, Ï.ο αρÏ.είο Ξα ήÏ.αΜ ακριβέÏ. αΜÏ.ίγραÏ.ο Ï.οÏ. tutor Ï.Ï.αΜ Ï.ο Ï.Ï.Ï.αÏ.ε.
+
+  5. ΀Ï.ρα ΎιαγράÏ.Ï.ε Ï.ο αρÏ.είο γράÏ.οΜÏ.αÏ. (MS-DOS):      :!del TEST
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                     Î.άΞηΌα 5.3: Î.Î Î.Î.Î.Î.΀Î.Î.Î. Î.Ν΀Î.Î.Î. Î.Î.Î.ΡÎ.ΊÎ.Σ
+
+
+          ** Î.ια Μα Ï.Ï.Ï.εÏ.ε Ï.ΌήΌα Ï.οÏ. αρÏ.είοÏ., γράÏ.Ï.ε  :#,# w Î.ΡΧÎ.Î.Î. **
+
+  1. Î.λλη Όια Ï.ορά, γράÏ.Ï.ε  :!dir  ή  :!ls  για Μα Ï.άρεÏ.ε Όία λίÏ.Ï.α αÏ.Ï. Ï.οΜ
+     καÏ.άλογÏ. Ï.αÏ. και ΎιαλέΟÏ.ε έΜα καÏ.άλληλο Ï.ΜοΌα αρÏ.είοÏ. Ï.Ï.Ï.Ï. Ï.ο TEST.
+
+  2. Î.εÏ.ακιΜείÏ.Ï.ε Ï.οΜ ΎροΌέα Ï.Ï.ο Ï.άΜÏ. ΌέροÏ. αÏ.Ï.ήÏ. Ï.ηÏ. Ï.ελίΎαÏ. και Ï.αÏ.ήÏ.Ï.ε
+     Ctrl-g  για Μα βρείÏ.ε Ï.οΜ αριΞΌÏ. αÏ.Ï.ήÏ. Ï.ηÏ. γραΌΌήÏ..
+     ΝÎ. Î.Î¥Î.Î.Σ΀Î. Î.Υ΀Î.Ν ΀Î.Ν Î.ΡÎ.Î.Î.Î.!
+
+  3. ΀Ï.ρα Ï.ηγαίΜεÏ.ε Ï.Ï.ο κάÏ.Ï. ΌέροÏ. Ï.ηÏ. Ï.ελίΎαÏ. και Ï.αÏ.ήÏ.Ï.ε  Ctrl-g  ΟαΜά.
+     ΝÎ. Î.Î¥Î.Î.Σ΀Î. Î.Î.Î. Î.Υ΀Î.Ν ΀Î.Ν Î.ΡÎ.Î.Î.Î.!
+
+  4. Î.ια Μα Ï.Ï.Ï.εÏ.ε Î.Î.ΝÎ. έΜα Ï.ΌήΌα Ï.ε αρÏ.είο, γράÏ.Ï.ε   :#,# w TEST
+     Ï.Ï.οÏ. #,# οι Ύύο αριΞΌοί Ï.οÏ. αÏ.οΌΜηΌοΜεύÏ.αÏ.ε (Ï.άΜÏ.,κάÏ.Ï.) και TEST Ï.ο
+     Ï.ΜοΌα Ï.οÏ. αρÏ.είοÏ. Ï.αÏ..
+
+  5. Î.αΜά, ΎείÏ.ε Ï.Ï.ι Ï.ο αρÏ.είο είΜαι εκεί Όε Ï.ηΜ  :!dir αλλά Î.Î.Ν Ï.ο ΎιαγράÏ.εÏ.ε.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                  Î.άΞηΌα 5.4: Î.ΝÎ.Î.΀ΩΝ΀Î.Σ Î.Î.Î. Î.ΝΩΝÎ.Ν΀Î.Σ Î.ΡΧÎ.Î.Î.
+
+
+     ** Î.ια Μα ειÏ.άγεÏ.ε Ï.α Ï.εριεÏ.Ï.ΌεΜα εΜÏ.Ï. αρÏ.είοÏ., γράÏ.Ï.ε   :r Î.ΡΧÎ.Î.Î. **
+
+  1. Î.ράÏ.Ï.ε  :!dir  για Μα βεβαιÏ.ΞείÏ.ε Ï.Ï.ι Ï.ο TEST Ï.Ï.άρÏ.ει αÏ.Ï. Ï.ριΜ.
+
+  2. ΀οÏ.οΞεÏ.ήÏ.Ï.ε Ï.οΜ ΎροΌέα Ï.Ï.ο Ï.άΜÏ. ΌέροÏ. Ï.ηÏ. Ï.ελίΎαÏ..
+
+ΣÎ.Î.Î.Î.ΩΣÎ.:  Î.Ï.Ï.Ï.οÏ. εκÏ.ελέÏ.εÏ.ε Ï.ο Î.ήΌα 3 Ξα ΎείÏ.ε Ï.ο Î.άΞηΌα 5.3.
+           Î.εÏ.ά κιΜηΞείÏ.ε Î.Î.΀Ω ΟαΜά Ï.ροÏ. Ï.ο ΌάΞηΌα αÏ.Ï.Ï..
+
+  3. ΀Ï.ρα αΜακÏ.ήÏ.Ï.ε Ï.ο αρÏ.είο Ï.αÏ. TEST Ï.ρηÏ.ιΌοÏ.οιÏ.ÎœÏ.αÏ. Ï.ηΜ εΜÏ.ολή  :r TEST
+     Ï.Ï.οÏ. TEST είΜαι Ï.ο Ï.ΜοΌα Ï.οÏ. αρÏ.είοÏ..
+
+ΣÎ.Î.Î.Î.ΩΣÎ.:  ΀ο αρÏ.είο Ï.οÏ. αΜακÏ.άÏ.ε Ï.οÏ.οΞεÏ.είÏ.αι ΟεκιΜÏ.ÎœÏ.αÏ. εκεί Ï.οÏ. βρίÏ.κεÏ.αι
+           ο ΎροΌέαÏ..
+
+  4. Î.ια Μα εÏ.αληΞεύÏ.εÏ.ε Ï.Ï.ι Ï.ο αρÏ.είο αΜακÏ.ήΞηκε, Ï.ίÏ.Ï. Ï.οΜ ΎροΌέα και
+     Ï.αραÏ.ηρήÏ.Ï.ε Ï.Ï.ι Ï.Ï.άρÏ.οÏ.Îœ Ï.Ï.ρα Ύύο αΜÏ.ίγραÏ.α Ï.οÏ. Î.αΞήΌαÏ.οÏ. 5.3, Ï.ο
+     αρÏ.ικÏ. και η έκΎοÏ.η Ï.οÏ. αρÏ.είοÏ..
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                               Î.Î.Î.Î.Î.Î. 5 Î Î.ΡÎ.Î.Î.ΚÎ.
+
+
+  1.  :!εΜÏ.ολή  εκÏ.ελεί Όία εΟÏ.Ï.ερική εΜÏ.ολή.
+
+      Î.ερικά Ï.ρήÏ.ιΌα Ï.αραΎείγΌαÏ.α είΜαι (MS-DOS):
+      :!dir            - εΌÏ.άΜιÏ.η λίÏ.Ï.αÏ. εΜÏ.Ï. καÏ.αλÏ.γοÏ..
+      :!del Î.ΡΧÎ.Î.Î.     - ΎιαγράÏ.ει Ï.ο Î.ΡΧÎ.Î.Î..
+
+  2.  :w Î.ΡΧÎ.Î.Î.   γράÏ.ει Ï.ο Ï.ρέÏ.Ï.Îœ αρÏ.είο Ï.οÏ. Vim Ï.Ï.ο ΎίÏ.κο Όε Ï.ΜοΌα Î.ΡΧÎ.Î.Î..
+
+  3.  :#,#w Î.ΡΧÎ.Î.Î.   Ï.Ï.ζει Ï.ιÏ. γραΌΌέÏ. αÏ.Ï. # ΌέÏ.ρι # Ï.Ï.ο Î.ΡΧÎ.Î.Î..
+
+  4.  :r Î.ΡΧÎ.Î.Î.  αΜακÏ.εί Ï.ο αρÏ.είο ΎίÏ.κοÏ. Î.ΡΧÎ.Î.Î. και Ï.ο Ï.αρεΌβάλλει ΌέÏ.α
+      Ï.Ï.ο Ï.ρέÏ.οΜ αρÏ.είο ΌεÏ.ά αÏ.Ï. Ï.η ΞέÏ.η Ï.οÏ. ΎροΌέα.
+
+
+
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        Î.άΞηΌα 6.1: Î. Î.Ν΀Î.Î.Î. Î.ΝÎ.Î.Î.Î.Î.΀Î.Σ
+
+
+      ** ΠαÏ.ήÏ.Ï.ε  o  για Μα αΜοίΟεÏ.ε Όία γραΌΌή κάÏ.Ï. αÏ.Ï. Ï.οΜ ΎροΌέα και Μα
+         βρεΞείÏ.ε Ï.ε Î.αÏ.άÏ.Ï.αÏ.η Î.ειΌέΜοÏ.. **
+
+  1. Î.εÏ.ακιΜείÏ.Ï.ε Ï.οΜ ΎροΌέα Ï.Ï.ηΜ Ï.αρακάÏ.Ï. γραΌΌή Ï.ηΌειÏ.ΌέΜη Όε --->.
+
+  2. ΠαÏ.ήÏ.Ï.ε  o (Ï.εζÏ.) για Μα αΜοίΟεÏ.ε Όία γραΌΌή Î.Î.΀Ω αÏ.Ï. Ï.οΜ ΎροΌέα και Μα
+     βρεΞείÏ.ε Ï.ε Î.αÏ.άÏ.Ï.αÏ.η Î.ειΌέΜοÏ..
+
+  3. ΀Ï.ρα αΜÏ.ιγράÏ.Ï.ε Ï.η Ï.ηΌειÏ.ΌέΜη Όε ---> γραΌΌή  και Ï.αÏ.ήÏ.Ï.ε <ESC> για Μα
+     βγείÏ.ε αÏ.Ï. Ï.ηΜ Î.αÏ.άÏ.Ï.αÏ.η Î.ειΌέΜοÏ..
+
+---> After typing  o  the cursor is placed on the open line in Insert mode.
+
+  4. Î.ια Μα αΜοίΟεÏ.ε Όία γραΌΌή Î Î.ΝΩ αÏ.Ï. Ï.οΜ ΎροΌέα, Ï.αÏ.ήÏ.Ï.ε αÏ.λά έΜα κεÏ.αλαίο
+     O, αΜÏ.ί για έΜα Ï.εζÏ.  o.  Î.οκιΌάÏ.Ï.ε Ï.ο Ï.Ï.ηΜ Ï.αρακάÏ.Ï. γραΌΌή.
+Î.ΜοίγεÏ.ε γραΌΌή Ï.άΜÏ. αÏ.Ï. αÏ.Ï.ήΜ Ï.αÏ.Ï.ÎœÏ.αÏ. Shift-O Ï.Ï.ο ο ΎροΌέαÏ. είΜαι Ï.Ï.η γραΌΌή
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                         Î.άΞηΌα 6.2: Î. Î.Ν΀Î.Î.Î. ΠΡÎ.ΣÎ.Î.Î.Î.Σ
+
+          ** ΠαÏ.ήÏ.Ï.ε   a   για Μα ειÏ.άγεÏ.ε κείΌεΜο Î.Î.΀Î. Ï.οΜ ΎροΌέα. **
+
+  1. Î.εÏ.ακιΜείÏ.Ï.ε Ï.οΜ ΎροΌέα Ï.Ï.ο Ï.έλοÏ. Ï.ηÏ. Ï.ρÏ.Ï.ηÏ. γραΌΌήÏ. Ï.αρακάÏ.Ï.
+     Ï.ηΌειÏ.ΌέΜη Όε ---> Ï.αÏ.Ï.ÎœÏ.αÏ.  $  Ï.Ï.ηΜ Î.αΜοΜική Î.αÏ.άÏ.Ï.αÏ.η.
+
+  2. ΠαÏ.ήÏ.Ï.ε έΜα  a  (Ï.εζÏ.) για Μα Ï.ροÏ.ΞέÏ.εÏ.ε κείΌεΜο Î.Î.΀Î. αÏ.Ï. Ï.οΜ Ï.αρακÏ.ήρα
+     Ï.οÏ. είΜαι κάÏ.Ï. αÏ.Ï. Ï.οΜ ΎροΌέα.  (΀ο κεÏ.αλαίο  A  Ï.ροÏ.ΞέÏ.ει Ï.Ï.ο Ï.έλοÏ.
+     Ï.ηÏ. γραΌΌήÏ.).
+
+ΣηΌείÏ.Ï.η: Î.Ï.Ï.Ï. αÏ.οÏ.εύγει Ï.ο Ï.άÏ.ηΌα Ï.οÏ.  i , Ï.οΜ Ï.ελεÏ.Ï.αίο Ï.αρακÏ.ήρα, Ï.ο
+          κείΌεΜο Ï.ηÏ. ειÏ.αγÏ.γήÏ., <ESC>, ΎροΌέα-ΎεΟιά, και Ï.έλοÏ., x, ÎŒÏ.Μο και
+          ÎŒÏ.Μο για Μα Ï.ροÏ.ΞέÏ.εÏ.ε Ï.Ï.ο Ï.έλοÏ. Ï.ηÏ. γραΌΌήÏ.!
+
+  3. ΣÏ.ÎŒÏ.ληρÏ.Ï.Ï.ε Ï.Ï.ρα Ï.ηΜ Ï.ρÏ.Ï.η γραΌΌή. ΣηΌειÏ.Ï.Ï.ε εÏ.ίÏ.ηÏ. Ï.Ï.ι η Ï.ροÏ.Ξήκη είΜαι
+     ακριβÏ.Ï. ίΎια Ï.Ï.ηΜ Î.αÏ.άÏ.Ï.αÏ.η Î.ειΌέΜοÏ. Όε Ï.ηΜ Î.αÏ.άÏ.Ï.αÏ.η Î.ιÏ.αγÏ.γήÏ., εκÏ.Ï.Ï.
+     αÏ.Ï. Ï.η ΞέÏ.η Ï.οÏ. ειÏ.άγεÏ.αι Ï.ο κείΌεΜο.
+
+---> This line will allow you to practice
+---> This line will allow you to practice appending text to the end of a line.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                   Î.άΞηΌα 6.3: Î.Î.Î.Î. Î.Î.Î.Î.ΣÎ. ΀Î.Σ Î.Ν΀Î.Î.Î.΀Î.Σ΀Î.ΣÎ.Σ
+
+
+ ** ΠαÏ.ήÏ.Ï.ε κεÏ.αλαίο  R  για Μα αλλάΟεÏ.ε Ï.εριÏ.Ï.Ï.Ï.εροÏ.Ï. αÏ.Ï. έΜαΜ Ï.αρακÏ.ήρεÏ.. **
+
+  1. Î.εÏ.ακιΜείÏ.Ï.ε Ï.οΜ ΎροΌέα Ï.Ï.ηΜ Ï.ρÏ.Ï.η γραΌΌή Ï.αρακάÏ.Ï. Ï.ηΌειÏ.ΌέΜη Όε --->.
+
+  2. ΀οÏ.οΞεÏ.ήÏ.Ï.ε Ï.οΜ ΎροΌέα Ï.Ï.ηΜ αρÏ.ή Ï.ηÏ. Ï.ρÏ.Ï.ηÏ. λέΟηÏ. Ï.οÏ. είΜαι ΎιαÏ.ορεÏ.ική
+     αÏ.Ï. Ï.η ΎεύÏ.ερη γραΌΌή Ï.ηΌειÏ.ΌέΜη Όε ---> (η λέΟη 'last').
+
+  3. ΠαÏ.ήÏ.Ï.ε Ï.Ï.ρα  R   και αλλάΟÏ.ε Ï.ο Ï.Ï.Ï.λοιÏ.ο Ï.οÏ. κειΌέΜοÏ. Ï.Ï.ηΜ Ï.ρÏ.Ï.η γραΌΌή
+     γράÏ.οΜÏ.αÏ. Ï.άΜÏ. αÏ.Ï. Ï.ο Ï.αλιÏ. κείΌεΜο Ï.Ï.Ï.ε Μα κάΜεÏ.ε Ï.ηΜ Ï.ρÏ.Ï.η γραΌΌή ίΎια
+     Όε Ï.η ΎεύÏ.ερη.
+
+---> 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.
+
+  4. ΣηΌειÏ.Ï.Ï.ε Ï.Ï.ι Ï.Ï.αΜ Ï.αÏ.άÏ.ε <ESC> για Μα βγείÏ.ε, Ï.αραΌέΜει οÏ.οιοΎήÏ.οÏ.ε
+     αΜαλλοίÏ.Ï.ο κείΌεΜο.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                          Î.άΞηΌα 6.4: ΡΥÎ.Î.Î.ΣÎ. Î.Î Î.Î.Î.Î.Î.Σ
+
+
+   ** ΡÏ.ΞΌίÏ.Ï.ε Όία εÏ.ιλογή έÏ.Ï.ι Ï.Ï.Ï.ε η αΜαζήÏ.ηÏ.η ή η αΜÏ.ικαÏ.άÏ.Ï.αÏ.η Μα αγΜοεί
+      Ï.η ΎιαÏ.ορά Ï.εζÏ.Îœ-κεÏ.αλαίÏ.Îœ **
+
+  1. ΚάΟÏ.ε για 'ignore' ειÏ.άγοΜÏ.αÏ.:
+     /ignore
+     ΣÏ.ΜεÏ.ίÏ.Ï.ε αρκεÏ.έÏ. Ï.ορέÏ. Ï.αÏ.Ï.ÎœÏ.αÏ. Ï.ο Ï.λήκÏ.ρο n.
+
+  2. Î.έÏ.Ï.ε Ï.ηΜ εÏ.ιλογή 'ic' (Ignore case) γράÏ.οΜÏ.αÏ.:
+     :set ic
+
+  3. ΚάΟÏ.ε Ï.Ï.ρα ΟαΜά για 'ignore' Ï.αÏ.Ï.ÎœÏ.αÏ.: n
+     ΣÏ.ΜεÏ.ίÏ.Ï.ε Ï.ηΜ αΜαζήÏ.ηÏ.η ΌερικέÏ. ακÏ.Όα Ï.ορέÏ. Ï.αÏ.Ï.ÎœÏ.αÏ. Ï.ο Ï.λήκÏ.ρο n
+
+  4. Î.έÏ.Ï.ε Ï.ιÏ. εÏ.ιλογέÏ. 'hlsearch' και 'incsearch':
+     :set hls is
+
+  5. Î.ιÏ.άγεÏ.ε Ï.Ï.ρα ΟαΜά Ï.ηΜ εΜÏ.ολή αΜαζήÏ.ηÏ.ηÏ., και ΎείÏ.ε Ï.ι Ï.Ï.ΌβαίΜει
+     /ignore
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                               Î.Î.Î.Î.Î.Î. 6 Î Î.ΡÎ.Î.Î.ΚÎ.
+
+
+  1. ΠαÏ.Ï.ÎœÏ.αÏ.  o  αΜοίγει Όία γραΌΌή Î.Î.΀Ω αÏ.Ï. Ï.οΜ ΎροΌέα και Ï.οÏ.οΞεÏ.εί Ï.οΜ
+     ΎροΌέα Ï.Ï.ηΜ αΜοιÏ.Ï.ή γραΌΌή Ï.ε Î.αÏ.άÏ.Ï.αÏ.η Î.ειΌέΜοÏ..
+
+  2. ΠαÏ.ήÏ.Ï.ε  a  για Μα ειÏ.άγεÏ.ε κείΌεΜο Î.Î.΀Î. Ï.οΜ Ï.αρακÏ.ήρα Ï.Ï.οΜ οÏ.οίο είΜαι
+     ο ΎροΌέαÏ.. ΠαÏ.Ï.ÎœÏ.αÏ. κεÏ.αλαίο  A  αÏ.Ï.Ï.ΌαÏ.α Ï.ροÏ.ΞέÏ.ει κείΌεΜο Ï.Ï.ο Ï.έλοÏ.
+     Ï.ηÏ. γραΌΌήÏ..
+
+  3. ΠαÏ.Ï.ÎœÏ.αÏ. κεÏ.αλαίο  R  ειÏ.έρÏ.εÏ.αι Ï.Ï.ηΜ Î.αÏ.άÏ.Ï.αη Î.ÎœÏ.ικαÏ.άÏ.Ï.αÏ.ηÏ. ΌέÏ.ρι Μα
+     Ï.αÏ.ηΞεί Ï.ο <ESC> και Μα εΟέλΞει.
+
+  4. Î.ράÏ.οΜÏ.αÏ. ":set xxx" ρÏ.ΞΌίζει Ï.ηΜ εÏ.ιλογή "xxx".
+
+
+
+
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                       Î.Î.Î.Î.Î.Î. 7: ON-LINE Î.Ν΀Î.Î.Î.Σ Î.Î.Î.Î.Î.Î.Î.Σ
+
+
+                ** ΧρηÏ.ιΌοÏ.οιήÏ.Ï.ε Ï.ο on-line Ï.ύÏ.Ï.ηΌα βοήΞειαÏ. **
+
+  Î. Vim έÏ.ει έΜα Ï.εριεκÏ.ικÏ. on-line Ï.ύÏ.Ï.ηΌα βοήΞειαÏ.. Î.ια Μα ΟεκιΜήÏ.ει,
+  ΎοκιΌάÏ.Ï.ε κάÏ.οιο αÏ.Ï. Ï.α Ï.ρία:
+        - Ï.αÏ.ήÏ.Ï.ε Ï.ο Ï.λήκÏ.ρο <HELP> (αΜ έÏ.εÏ.ε κάÏ.οιο)
+        - Ï.αÏ.ήÏ.Ï.ε Ï.ο Ï.λήκÏ.ρο <F1> (αΜ έÏ.εÏ.ε κάÏ.οιο)
+        - γράÏ.Ï.ε   :help <ENTER>
+
+  Î.ράÏ.Ï.ε  :q <ENTER>   για Μα κλείÏ.εÏ.ε Ï.ο Ï.αράΞÏ.ρο Ï.ηÏ. βοήΞειαÏ..
+
+  Î.Ï.ορείÏ.ε Μα βρείÏ.ε βοήΞεια Ï.άΜÏ. Ï.ε κάΞε αΜÏ.ικείΌεΜο, ΎίΜοΜÏ.αÏ. Όία Ï.αράΌεÏ.ρο
+  Ï.Ï.ηΜ εΜÏ.ολή ":help".  Î.οκιΌάÏ.Ï.ε αÏ.Ï.ά (ΌηΜ ΟεÏ.ΜάÏ.ε Μα Ï.αÏ.άÏ.ε <ENTER>):
+
+        :help w
+        :help c_<T
+        :help insert-index
+        :help user-manual
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                  Î.Î.Î.Î.Î.Î. 8: Î.Î.Î.Î.Î.ΥΡÎ.Î.Σ΀Î. Î.ΝÎ. SCRIPT Î.Î.Î.Î.ΝÎ.ΣÎ.Σ
+
+                   ** Î.ΜεργοÏ.οιήÏ.Ï.ε Ï.αρακÏ.ηριÏ.Ï.ικά Ï.οÏ. Vim **
+
+  Î. Vim έÏ.ει Ï.ολλά Ï.εριÏ.Ï.Ï.Ï.ερα Ï.αρακÏ.ηριÏ.Ï.ικά αÏ.' Ï.,Ï.ι ο Vi, αλλά Ï.α
+  Ï.εριÏ.Ï.Ï.Ï.ερα είΜαι αρÏ.ικά αÏ.εΜεργοÏ.οιηΌέΜα. Î.ια Μα αρÏ.ίÏ.εÏ.ε Μα Ï.ρηÏ.ιΌοÏ.οιείÏ.ε
+  Ï.εριÏ.Ï.Ï.Ï.ερα Ï.αρακÏ.ηριÏ.Ï.ικά Ï.ρέÏ.ει Μα Ï.Ï.ιάΟεÏ.ε έΜα αρÏ.είο "vimrc".
+
+  1. Î.ρÏ.ίÏ.Ï.ε ΎιορΞÏ.ΜοΜÏ.αÏ. Ï.ο αρÏ.είο "vimrc", αÏ.Ï.Ï. εΟαρÏ.άÏ.αι αÏ.Ï. Ï.ο Ï.ύÏ.Ï.ηΌά Ï.αÏ.:
+        :edit ~/.vimrc               για Unix
+        :edit $VIM/_vimrc            για MS-Windows
+
+  2. ΀Ï.ρα ειÏ.άγεÏ.ε Ï.ο κείΌεΜο Ï.αραΎείγΌαÏ.οÏ. για αρÏ.είο "vimrc":
+        :read $VIMRUNTIME/vimrc_example.vim
+
+  3. Î.ράÏ.Ï.ε Ï.ο αρÏ.είο Όε Ï.ηΜ:
+        :write
+
+  ΀ηΜ εÏ.Ï.ΌεΜη Ï.ορά Ï.οÏ. Ξα ΟεκιΜήÏ.εÏ.ε Ï.οΜ Vim Ξα Ï.ρηÏ.ιΌοÏ.οιήÏ.ει Ï.Ï.Ï.ιÏ.ÎŒÏ.
+  Ï.ύΜÏ.αΟηÏ..  Î.Ï.ορείÏ.ε Μα Ï.ροÏ.ΞέÏ.εÏ.ε Ï.λεÏ. Ï.ιÏ. Ï.ροÏ.ιΌÏ.ΌεΜεÏ. εÏ.ιλογέÏ. Ï.' αÏ.Ï.Ï.
+  Ï.ο αρÏ.είο "vimrc".
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+  Î.ÎŽÏ. ολοκληρÏ.ΜεÏ.αι Ï.ο Vim Tutor. ΣκοÏ.Ï.Ï. Ï.οÏ. ήÏ.αΜ Μα ÎŽÏ.Ï.ει Όία Ï.ύΜÏ.οΌη
+  Ï.ερίληÏ.η Ï.οÏ. Ï.Ï.ÎœÏ.άκÏ.η Vim, Ï.οÏ.λάÏ.ιÏ.Ï.οΜ Ï.Ï.Ï.η Ï.Ï.Ï.ε Μα Ï.αÏ. εÏ.ιÏ.ρέÏ.ει Μα
+  Ï.ρηÏ.ιΌοÏ.οιήÏ.εÏ.ε Ï.οΜ Ï.Ï.ÎœÏ.άκÏ.η αρκεÏ.ά εύκολα. Î.Ï.έÏ.ει Ï.ολύ αÏ.Ï. Όία
+  ολοκληρÏ.ΌέΜη Ï.αροÏ.Ï.ίαÏ.η καΞÏ.Ï. ο Vim έÏ.ει Ï.άρα Ï.ολλέÏ. εΜÏ.ολέÏ.. Î.ιαβάÏ.Ï.ε
+  καÏ.Ï.Ï.ιΜ Ï.ο εγÏ.ειρίΎιο Ï.ρήÏ.ηÏ.:
+        ":help user-manual".
+
+  Î.ια Ï.εραιÏ.έρÏ. ΎιάβαÏ.Όα και ΌελέÏ.η, Ï.Ï.Ï.Ï.ήΜεÏ.αι αÏ.Ï.Ï. Ï.ο βιβλίο:
+        Vim - Vi Improved - by Steve Oualline
+        Publisher: New Riders
+        ΀ο Ï.ρÏ.Ï.ο βιβλίο Ï.λήρÏ.Ï. αÏ.ιερÏ.ΌέΜο Ï.Ï.οΜ Vim.
+        Î.ΎιαίÏ.ερα Ï.ρήÏ.ιΌο για αρÏ.άριοÏ.Ï..
+        Î¥Ï.άρÏ.οÏ.Îœ Ï.ολλά Ï.αραΎείγΌαÏ.α και εικÏ.ΜεÏ..
+        Î.είÏ.ε Ï.ηΜ http://iccf-holland.org/click5.html
+
+  Î.Ï.Ï.Ï. Ï.ο βιβλίο είΜαι Ï.αλιÏ.Ï.ερο και Ï.εριÏ.Ï.Ï.Ï.ερο για Ï.οΜ Vi Ï.αρά για Ï.οΜ Vim,
+  αλλά εÏ.ίÏ.ηÏ. Ï.Ï.ΜιÏ.Ï.Ï.ΌεΜο:
+        Learning the Vi Editor - by Linda Lamb
+        Publisher: O'Reilly & Associates Inc.
+        Î.ίΜαι έΜα καλÏ. βιβλίο για Μα ΌάΞεÏ.ε Ï.Ï.εΎÏ.Îœ Ï.α Ï.άΜÏ.α Ï.οÏ. ΞέλεÏ.ε
+        Μα κάΜεÏ.ε Όε Ï.οΜ Vi.
+        Î. έκÏ.η έκΎοÏ.η Ï.εριέÏ.ει ακÏ.Όα Ï.ληροÏ.ορίεÏ. για Ï.οΜ Vim.
+
+  Î.Ï.Ï.ή η Ï.εριήγηÏ.η γράÏ.Ï.ηκε αÏ.Ï. Ï.οÏ.Ï. Michael C. Pierce και Robert K. Ware,
+  Colorado School of Mines Ï.ρηÏ.ιΌοÏ.οιÏ.ÎœÏ.αÏ. ιΎέεÏ. αÏ.Ï. Ï.οΜ Charles Smith,
+  Colorado State University.  E-mail: bware@mines.colorado.edu.
+
+  ΠροÏ.αρΌογή για Ï.οΜ Vim αÏ.Ï. Ï.οΜ Bram Moolenaar.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

runtime/tutor/tutor.ru.utf-8

@@ +1 @@
+===============================================================================
+=    Ð. П б Ñ. П   п П ж а л П в а Ñ. Ñ.   в   Ñ. Ñ. е б Ðœ О к   VIM  -  Ð.еÑ.сОя 1.5 =
+===============================================================================
+     Vim --- эÑ.П ПÑ.еМÑ. ЌПÑ.ÐœÑ.й Ñ.еЎакÑ.ПÑ., ОЌеÑ.Ñ.Ой ЌМПжесÑ.вП кПЌаМЎ, слОÑ.кПЌ
+     ЌМПгП Ўля Ñ.ПгП, Ñ.Ñ.ПбÑ. ОÑ. все ЌПжМП бÑ.лП ПпОсаÑ.Ñ. в Ñ.акПЌ Ñ.Ñ.ебМОке, как
+     эÑ.ПÑ.. ЭÑ.ПÑ. Ñ.Ñ.ебМОк пÑ.ОзваМ ПбÑ.ясМОÑ.Ñ. ЎПсÑ.аÑ.ПÑ.МПе Ñ.ОслП кПЌаМЎ Ўля Ñ.ПгП,
+     Ñ.Ñ.ПбÑ. Ð.Ñ. ЌПглО с легкПсÑ.Ñ.Ñ. ОспПлÑ.зПваÑ.Ñ. Vim в каÑ.есÑ.ве Ñ.еЎакÑ.ПÑ.а ПбÑ.егП
+     МазМаÑ.еМОя.
+
+     Ð.аЌ пПÑ.Ñ.ебÑ.еÑ.ся пÑ.ОблОзОÑ.елÑ.МП 25-30 ЌОМÑ.Ñ. Ма ПсвПеМОе ЎаММПгП Ñ.Ñ.ебМОка в
+     завОсОЌПсÑ.О ПÑ. Ñ.ПгП, скПлÑ.кП вÑ.еЌеМО Ð.Ñ. пПÑ.Ñ.аÑ.ОÑ.е Ма экспеÑ.ОЌеМÑ.Ñ..
+
+     Ð.ПЌаМЎÑ. в Ñ.Ñ.ПкаÑ. бÑ.ÐŽÑ.Ñ. ЌПЎОÑ.ОÑ.ОÑ.ПваÑ.Ñ. Ñ.ексÑ.. СПзЎайÑ.е кПпОÑ. эÑ.ПгП Ñ.айла,
+     Ñ.Ñ.ПбÑ. пПпÑ.акÑ.ОкПваÑ.Ñ.ся Ма Мей (еслО Ð.Ñ. запÑ.сÑ.ОлО "vimtutor", Ñ.П эÑ.П Ñ.же
+     кПпОя).
+
+     Ð.ажМП пПЌМОÑ.Ñ., Ñ.Ñ.П эÑ.ПÑ. Ñ.Ñ.ебМОк пÑ.еЎМазМаÑ.еМ Ўля ПбÑ.Ñ.еМОя в пÑ.ПÑ.ессе
+     ОспПлÑ.зПваМОя. ЭÑ.П ПзМаÑ.аеÑ., Ñ.Ñ.П Ð.Ñ. ЎПлжМÑ. запÑ.скаÑ.Ñ. кПЌаМЎÑ. Ўля Ñ.ПгП,
+     Ñ.Ñ.ПбÑ. как слеЎÑ.еÑ. ОÑ. ОзÑ.Ñ.ОÑ.Ñ.. Ð.слО Ð.Ñ. пÑ.ПсÑ.П пÑ.ПÑ.ОÑ.аеÑ.е Ñ.ексÑ., Ñ.П
+     забÑ.ЎеÑ.е кПЌаМЎÑ.!
+
+     ТепеÑ.Ñ. Ñ.беЎОÑ.есÑ. в Ñ.ПЌ, Ñ.Ñ.П клавОÑ.а CapsLock Ме вклÑ.Ñ.еМа О МажЌОÑ.е
+     клавОÑ.Ñ.   j   МескПлÑ.кП Ñ.аз, Ñ.ак, Ñ.Ñ.ПбÑ. УÑ.Пк 1.1 пПлМПсÑ.Ñ.Ñ. пПЌесÑ.Олся Ма
+     экÑ.аМе.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        УÑ.Пк 1.1:  Ð.Ð.Ð Ð.Ð.Ð.ЩÐ.НÐ.Ð. Ð.УРСÐ.РА
+
+** Ð.ля пеÑ.еЌеÑ.еМОя кÑ.Ñ.сПÑ.а МажЌОÑ.е клавОÑ.О h,j,k,l Ñ.ак, как пПказаМП МОже. **
+             ^
+             k          СПвеÑ.Ñ.:   Ð.лавОÑ.а h МаÑ.ПЎОÑ.ся слева О пеÑ.еЌеÑ.аеÑ. влевП.
+       < h       l >            Ð.лавОÑ.а l МаÑ.ПЎОÑ.ся спÑ.ава О пеÑ.еЌеÑ.аеÑ. впÑ.авП.
+             j                  Ð.лавОÑ.а j пПÑ.Пжа Ма сÑ.Ñ.елкÑ. `вМОз'.
+             v
+  1. Ð.ПЎвОгайÑ.е кÑ.Ñ.сПÑ. пП экÑ.аМÑ., пПка Ме пПÑ.Ñ.всÑ.вÑ.еÑ.е себя Ñ.веÑ.еММП.
+
+  2. НаЎавОÑ.е клавОÑ.Ñ. `вМОз' (j) пПка ПМа Ме МаÑ.МеÑ. пПвÑ.ПÑ.яÑ.Ñ.ся.
+---> ТепеÑ.Ñ. Ð.Ñ. зМаеÑ.е, как пеÑ.ейÑ.О к слеЎÑ.Ñ.Ñ.еЌÑ. Ñ.Ñ.ПкÑ..
+
+  3. Ð.спПлÑ.зÑ.я клавОÑ.Ñ. `вМОз' пеÑ.ейЎОÑ.е к УÑ.ПкÑ. 1.2.
+
+Ð.аЌеÑ.аМОе: Ð.слО вÑ. пПка Ме Ñ.веÑ.еМÑ. в Ñ.ПЌ, Ñ.Ñ.П МабОÑ.аеÑ.е, МажЌОÑ.е <ESC> Ўля
+           пеÑ.еÑ.ПЎа в ПбÑ.Ñ.ÐœÑ.й Ñ.ежОЌ (Normal mode). Ð.Псле эÑ.ПгП пеÑ.еМабеÑ.ОÑ.е
+           Ñ.Ñ.ебÑ.еЌÑ.Ñ. кПЌаМЎÑ..
+
+Ð.аЌеÑ.аМОе: Ð.бÑ.Ñ.ÐœÑ.е клавОÑ.О Ñ.пÑ.авлеМОя кÑ.Ñ.сПÑ.ПЌ (сÑ.Ñ.елкО) Ñ.акже ЎПлжМÑ.
+           Ñ.абПÑ.аÑ.Ñ.. Ð.ЎМакП, клавОÑ.О hjkl пПзвПляÑ. Ð.аЌ пеÑ.еЌеÑ.аÑ.Ñ.ся
+           зМаÑ.ОÑ.елÑ.МП бÑ.сÑ.Ñ.ее, как Ñ.ПлÑ.кП Ð.Ñ. МаÑ.Ñ.ОÑ.есÑ. ОЌО пПлÑ.зПваÑ.Ñ.ся.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                  УÑ.Пк 1.2: Ð.АÐ.УСÐ. Ð. Ð.АÐ.Ð.РКÐ.НÐ.Ð. РАÐ.Ð.ТЫ С VIM
+
+!! Ð.НÐ.Ð.АНÐ.Ð.! Ð.Ñ.ежЎе, Ñ.еЌ вÑ.пПлМяÑ.Ñ. лÑ.бПй Оз ПпОсаММÑ.Ñ. МОже Ñ.агПв, пÑ.ПÑ.Ñ.ОÑ.е
+                               Ñ.Ñ.Пк Ñ.елОкПЌ !!
+
+  1. НажЌОÑ.е клавОÑ.Ñ. <ESC> (Ўля Ñ.ПгП, Ñ.Ñ.ПбÑ. Ñ.ЎПсÑ.ПвеÑ.ОÑ.Ñ.ся, Ñ.Ñ.П Ð.Ñ. в ПбÑ.Ñ.МПЌ
+     Ñ.ежОЌе (Normal mode)).
+
+  2. НабеÑ.ОÑ.е:                  :q! <ENTER>.
+
+---> ЭÑ.П пПзвПлОÑ. Ð.аЌ вÑ.йÑ.О Оз Ñ.еЎакÑ.ПÑ.а Ð.Ð.Ð. СÐ.ХРАНÐ.НÐ.Я лÑ.бÑ.Ñ. сЎелаММÑ.Ñ.
+     ОзЌеМеМОй. Ð.слО Ð.Ñ. Ñ.ПÑ.ОÑ.е сПÑ.Ñ.аМОÑ.Ñ. ОзЌеМеМОя О вÑ.йÑ.О:
+                                :wq  <ENTER>
+
+  3. Ð.ПгЎа Ð.Ñ. Ñ.вОЎОÑ.е пÑ.ОглаÑ.еМОе кПЌаМЎМПй ПбПлПÑ.кО, МабеÑ.ОÑ.е кПЌаМЎÑ.,
+     кПÑ.ПÑ.ая пÑ.Овела Ð.ас в эÑ.ПÑ. Ñ.Ñ.ебМОк. ЭÑ.П ЌПжеÑ. бÑ.Ñ.Ñ.
+                                vimtutor ru <ENTER>
+     Ð.бÑ.Ñ.МП ЌПжМП ОспПлÑ.зПваÑ.Ñ.:  vim tutor.ru <ENTER>
+
+---> 'vim' пПзвПляеÑ. запÑ.сÑ.ОÑ.Ñ. Ñ.еЎакÑ.ПÑ. vim, 'tutor.ru' --- эÑ.П Ñ.айл, кПÑ.ПÑ.Ñ.й
+     Ð.Ñ. бÑ.ЎеÑ.е Ñ.еЎакÑ.ОÑ.ПваÑ.Ñ..
+
+  4. Ð.слО Ð.Ñ. Ñ.веÑ.еМÑ. в Ñ.ПЌ, Ñ.Ñ.П запПЌМОлО эÑ.О Ñ.агО, вÑ.пПлМОÑ.е Ñ.агО ПÑ. 1 ЎП 3
+     Ñ.Ñ.ПбÑ. вÑ.йÑ.О сМПва запÑ.сÑ.ОÑ.Ñ. Ñ.еЎакÑ.ПÑ.. Ð.аÑ.еЌ пеÑ.еЌесÑ.ОÑ.е кÑ.Ñ.сПÑ. вМОз к
+     УÑ.ПкÑ. 1.3.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                  УÑ.Пк 1.3: Ð Ð.Ð.АÐ.ТÐ.Ð Ð.Ð.АНÐ.Ð. ТÐ.Ð.СТА - УÐ.АÐ.Ð.НÐ.Ð.
+
+
+** НаÑ.ПЎясÑ. в ПбÑ.Ñ.МПЌ Ñ.ежОЌе МажЌОÑ.е x, Ñ.Ñ.ПбÑ. Ñ.ЎалОÑ.Ñ. сОЌвПл пПЎ кÑ.Ñ.сПÑ.ПЌ. **
+
+  1. Ð.еÑ.еЌесÑ.ОÑ.е кÑ.Ñ.сПÑ. к сÑ.Ñ.Пке вМОзÑ., пПЌеÑ.еММПй --->.
+
+  2. Ð.ля ОспÑ.авлеМОя ПÑ.ОбПк, пеÑ.еЌесÑ.ОÑ.е кÑ.Ñ.сПÑ., пПка ПМ Ме ПкажеÑ.ся МаЎ
+     Ñ.ЎаляеЌÑ.ÐŒ сОЌвПлПЌ.
+
+  3. НажЌОÑ.е клавОÑ.Ñ. x Ўля Ñ.ЎалеМОя Ñ.Ñ.ебÑ.еЌПгП сОЌвПла.
+
+  4. Ð.ПвÑ.ПÑ.ОÑ.е Ñ.агО 2--4 пПка сÑ.Ñ.Пка Ме бÑ.ЎеÑ. ОспÑ.авлеМа.
+
+---> Ð.Ñ. Ñ.Ñ.Ñ.ПпПÑ.а кПпÑ.Ñ.Ñ. пппÑ.лÑ. ппП пппПлÑ. леÑ.Ñ.ОÑ.Ñ..
+
+  5. ТепеÑ.Ñ., кПгЎа сÑ.Ñ.Пка ПÑ.кПÑ.Ñ.екÑ.ОÑ.ПваМа, пеÑ.еÑ.ПЎОÑ.е к Ñ.Ñ.ПкÑ. 1.4.
+
+Ð.АÐ.Ð.ЧАНÐ.Ð.: Ð. Ñ.ПЎе ПсвПеМОя эÑ.ПгП Ñ.Ñ.ебМОка Ме пÑ.Ñ.айÑ.есÑ. запПЌОМаÑ.Ñ., Ñ.Ñ.ОÑ.е
+           в пÑ.ПÑ.ессе ОспПлÑ.зПваМОя.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                  УÑ.Пк 1.4: Ð Ð.Ð.АÐ.ТÐ.Ð Ð.Ð.АНÐ.Ð. ТÐ.Ð.СТА - Ð.СТАÐ.Ð.А
+
+
+ ** НаÑ.ПЎясÑ. в ПбÑ.Ñ.МПЌ Ñ.ежОЌе (Normal mode), МажЌОÑ.е i Ўля всÑ.авкО Ñ.ексÑ.а. **
+
+  1. Ð.еÑ.еЌесÑ.ОÑ.е кÑ.Ñ.сПÑ. к пеÑ.вПй сÑ.Ñ.Пке вМОзÑ., пПЌеÑ.еММПй --->.
+
+  2. Ð.ля Ñ.ПгП, Ñ.Ñ.ПбÑ. сЎелаÑ.Ñ. пеÑ.вÑ.Ñ. сÑ.Ñ.ПкÑ. ОЎеМÑ.ОÑ.МПй вÑ.ПÑ.Пй, пПЌесÑ.ОÑ.е
+     кÑ.Ñ.сПÑ. Ма сОЌвПл Ð.Ð.Ð Ð.Ð. кПÑ.ПÑ.Ñ.ÐŒ слеЎÑ.еÑ. всÑ.авОÑ.Ñ. Ñ.ексÑ..
+
+  3. НажЌОÑ.е i О МабеÑ.ОÑ.е Ñ.Ñ.ебÑ.еЌÑ.е ЎПбавлеМОя.
+
+  4. Ð.Псле ОспÑ.авлеМОя всеÑ. ПÑ.ОбПк МажЌОÑ.е <ESC> Ўля вПзвÑ.аÑ.а в ПбÑ.Ñ.ÐœÑ.й Ñ.ежОЌ.
+     Ð.ПвÑ.ПÑ.ОÑ.е Ñ.агО 2--4, пПка Ñ.Ñ.аза Ме бÑ.ЎеÑ. ОспÑ.авлеМа пПлМПсÑ.Ñ.Ñ..
+
+---> ЧасÑ.Ñ. Ñ.ексÑ.а в сÑ.Ñ.Пке беслеЎМП .
+---> ЧасÑ.Ñ. Ñ.ексÑ.а в эÑ.Пй сÑ.Ñ.Пке бесслеЎМП пÑ.Ппала.
+
+  5. Ð.ПгЎа ПсвПОÑ.е всÑ.авкÑ. Ñ.ексÑ.а, пеÑ.еÑ.ПЎОÑ.е ЎалÑ.Ñ.е к РезÑ.Ќе.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                Ð Ð.Ð.ЮÐ.Ð. УРÐ.Ð.А 1
+
+  1. Ð.Ñ.Ñ.сПÑ. пеÑ.еЌеÑ.аеÑ.ся лОбП клавОÑ.аЌО сП сÑ.Ñ.елкаЌО, лОбП клавОÑ.аЌО hjkl.
+         h (влевП) j (вМОз)       k (ввеÑ.Ñ.)           l (впÑ.авП)
+
+  2. Ð.ля запÑ.ска Vim (Оз пÑ.ОглаÑ.еМОя % кПЌаМЎМПй ПбПлПÑ.кО) МабеÑ.ОÑ.е:
+     vim Ð.Ð.Я_ЀАÐ.Ð.А <ENTER>
+
+  3. Ð.ля завеÑ.Ñ.еМОя Ñ.абПÑ.Ñ. с Vim МабеÑ.ОÑ.е:
+     <ESC>   :q!         <ENTER>  Ñ.Ñ.ПбÑ. ПÑ.казаÑ.Ñ.ся ПÑ. сПÑ.Ñ.аМеМОя ОзЌеМеМОй.
+     Ð.лО МабеÑ.ОÑ.е:
+     <ESC>   :wq         <ENTER>  Ñ.Ñ.ПбÑ. сПÑ.Ñ.аМОÑ.Ñ. ОзЌеМеМОя.
+
+  4. Ð.ля Ñ.ЎалеМОя сОЌвПла пПЎ кÑ.Ñ.сПÑ.ПЌ в ПбÑ.Ñ.МПЌ Ñ.ежОЌе, МабеÑ.ОÑ.е: x
+
+  5. ЧÑ.ПбÑ. всÑ.авОÑ.Ñ. Ñ.ексÑ. пеÑ.еЎ кÑ.Ñ.сПÑ.ПЌ в ПбÑ.Ñ.МПЌ Ñ.ежОЌе, МабеÑ.ОÑ.е:
+         i     ввПЎОÑ.е Ñ.ексÑ.        <ESC>
+
+Ð.АÐ.Ð.ЧАНÐ.Ð.: НажаÑ.Ое <ESC> пеÑ.еЌесÑ.ОÑ. Ð.ас в ПбÑ.Ñ.ÐœÑ.й Ñ.ежОЌ (Normal mode) лОбП
+           пÑ.еÑ.веÑ. МежелаÑ.елÑ.ÐœÑ.Ñ. О Ñ.асÑ.ОÑ.МП завеÑ.Ñ.еММÑ.Ñ. кПЌаМЎÑ..
+
+ТепеÑ.Ñ. пеÑ.еÑ.ПЎОЌ к УÑ.ПкÑ. 2.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                          УÑ.Пк 2.1: Ð.Ð.Ð.АНÐ.Ы УÐ.АÐ.Ð.НÐ.Я
+
+
+        ** НабеÑ.ОÑ.е dw Ўля Ñ.ЎалеМОя Ñ.Ñ.асÑ.ка Ñ.ексÑ.а ЎП кПМÑ.а слПва. **
+
+  1. НажЌОÑ.е <ESC>, Ñ.Ñ.ПбÑ. пеÑ.ейÑ.О в ПбÑ.Ñ.ÐœÑ.й Ñ.ежОЌ.
+
+  2. Ð.еÑ.еЌесÑ.ОÑ.е кÑ.Ñ.сПÑ. вМОз, к сÑ.Ñ.Пке, пПЌеÑ.еММПй --->.
+
+  3. Ð.еÑ.еЌесÑ.ОÑ.е кÑ.Ñ.сПÑ. в МаÑ.алП слПва, кПÑ.ПÑ.Пе слеЎÑ.еÑ. Ñ.ЎалОÑ.Ñ..
+
+  4. НабеÑ.ОÑ.е  dw , Ñ.Ñ.ПбÑ. Ñ.ЎалОÑ.Ñ. эÑ.П слПвП.
+
+Ð.АÐ.Ð.ЧАНÐ.Ð.: Ð.П вÑ.еЌя МабПÑ.а бÑ.квÑ. dw пПявяÑ.ся в пПслеЎМей сÑ.Ñ.Пке экÑ.аМа. Ð.слО
+           Ð.Ñ. Ñ.Ñ.П-Ñ.П МабеÑ.еÑ.е МепÑ.авОлÑ.МП, МажЌОÑ.е <ESC> О МаÑ.МОÑ.е сМаÑ.ала.
+
+---> НескПлÑ.кП слПв Ñ.аÑ.ОМаЎ в эÑ.ПЌ пÑ.еЎлПжеМОО авÑ.ПкÑ.аМ ОзлОÑ.МО.
+
+  5. Ð.ПвÑ.ПÑ.ОÑ.е Ñ.агО 3 О 4, пПка Ме ОспÑ.авОÑ.е все ПÑ.ОбкО О пеÑ.еÑ.ПЎОÑ.е к
+     УÑ.ПкÑ. 2.2.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                  УÑ.Пк 2.2: Ð.Ð.Ð.Ð.Ð.НÐ.ТÐ.Ð.ЬНЫÐ. Ð.Ð.Ð.АНÐ.Ы УÐ.АÐ.Ð.НÐ.Я
+
+
+            ** НабеÑ.ОÑ.е d$ Ўля Ñ.ЎалеМОя Ñ.ексÑ.а ЎП кПМÑ.а сÑ.Ñ.ПкО. **
+
+  1. НажЌОÑ.е <ESC>, Ñ.Ñ.ПбÑ. пеÑ.ейÑ.О в ПбÑ.Ñ.ÐœÑ.й Ñ.ежОЌ.
+
+  2. Ð.еÑ.еЌесÑ.ОÑ.е кÑ.Ñ.сПÑ. вМОз, к сÑ.Ñ.Пке, пПЌеÑ.еММПй --->.
+
+  3. Ð.еÑ.еЌесÑ.ОÑ.е кÑ.Ñ.сПÑ. к кПМÑ.Ñ. пÑ.авОлÑ.МПй сÑ.Ñ.ПкО (Ð.Ð.СÐ.Ð. пеÑ.вПй . ).
+
+  4. ЧÑ.ПбÑ. Ñ.ЎалОÑ.Ñ. ПсÑ.аÑ.Пк сÑ.Ñ.ПкО, МабеÑ.ОÑ.е  d$ .
+
+---> Ð.Ñ.П-Ñ.П МабÑ.ал ПкПМÑ.аМОе эÑ.Пй сÑ.Ñ.ПкО ЎважЎÑ.. ПкПМÑ.аМОе эÑ.Пй сÑ.Ñ.ПкО ЎважЎÑ..
+
+
+  5.ЧÑ.ПбÑ. лÑ.Ñ.Ñ.е Ñ.азПбÑ.аÑ.Ñ.ся в эÑ.ПЌ, пеÑ.еÑ.ПЎОÑ.е к УÑ.ПкÑ. 2.3.
+
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                         УÑ.Пк 2.3: Ð.Ð.Ð.АНÐ.Ы Ð. Ð.Ð.ЪÐ.Ð.ТЫ
+
+
+  ЀПÑ.ЌаÑ. кПЌаМЎÑ. `Ñ.ЎалеМОе' d Ñ.акПв:
+
+         [Ñ.ОслП]   d       ПбÑ.екÑ.        Ð.Ð.Ð.           d   [Ñ.ОслП]   ПбÑ.екÑ.
+  Ð.ЎесÑ.:
+    Ñ.ОслП  - скПлÑ.кП Ñ.аз ОспПлМОÑ.Ñ. кПЌаМЎÑ. (МеПбязаÑ.елÑ.МП, пП Ñ.ЌПлÑ.аМОÑ.=1).
+    d      - кПЌаМЎа Ñ.ЎалеМОя.
+    ПбÑ.екÑ. - с Ñ.еЌ кПЌаМЎа ЎПлжМа бÑ.Ñ.Ñ. вÑ.пПлМеМа (пеÑ.еÑ.ОслеМП МОже).
+
+  Ð.Ñ.аÑ.кОй спОсПк ПбÑ.екÑ.Пв:
+    w - ПÑ. кÑ.Ñ.сПÑ.а ЎП кПМÑ.а слПва, вклÑ.Ñ.ая завеÑ.Ñ.аÑ.Ñ.Ой пÑ.Пбел.
+    e - ПÑ. кÑ.Ñ.сПÑ.а ЎП кПМÑ.а слПва, НÐ. вклÑ.Ñ.ая завеÑ.Ñ.аÑ.Ñ.Ой пÑ.Пбел.
+    $ - ПÑ. кÑ.Ñ.сПÑ.а ЎП кПМÑ.а сÑ.Ñ.ПкО.
+    ^ - ПÑ. кÑ.Ñ.сПÑ.а ЎП МаÑ.ала сÑ.Ñ.ПкО.
+
+Ð.АÐ.Ð.ЧАНÐ.Ð.: Ð.Ñ.ПсÑ.Пе МажаÑ.Ое Ма сОЌвПл ПбÑ.екÑ.а в ПбÑ.Ñ.МПЌ Ñ.ежОЌе (Normal mode)
+           без ЎПпПлМОÑ.елÑ.ÐœÑ.Ñ. кПЌаМЎ пеÑ.еЎвОМеÑ. кÑ.Ñ.сПÑ. Ñ.ак, как Ñ.казаМП в
+           спОске ПбÑ.екÑ.Пв.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+               УÑ.Пк 2.4: Ð.СÐ.Ð.ЮЧÐ.НÐ.Ð. Ð.Ð. Ð.РАÐ.Ð.Ð.А `Ð.Ð.Ð.АНÐ.А-Ð.Ð.ЪÐ.Ð.Т'
+
+
+                 ** НабеÑ.ОÑ.е dd Ўля Ñ.ЎалеМОя всей сÑ.Ñ.ПкО. **
+
+  Ð.слеЎсÑ.вОе Ñ.асÑ.ПгП пÑ.ОЌеМеМОя ПпеÑ.аÑ.ОО Ñ.ЎалеМОя всей сÑ.Ñ.ПкО, Ñ.азÑ.абПÑ.Ñ.ОкО
+  Vim Ñ.еÑ.ОлО, Ñ.Ñ.П Ўля эÑ.ПгП пÑ.ПÑ.е всегП пÑ.ПсÑ.П МабÑ.аÑ.Ñ. d ЎважЎÑ..
+
+  1. Ð.еÑ.еЌесÑ.ОÑ.е кÑ.Ñ.сПÑ. вМОз, кП вÑ.ПÑ.Пй сÑ.Ñ.Пке Ñ.Ñ.азÑ..
+  2. НабеÑ.ОÑ.е dd Ўля Ñ.ЎалеМОя сÑ.Ñ.ПкО.
+  3. ТепеÑ.Ñ. пеÑ.еЌесÑ.ОÑ.есÑ. к Ñ.еÑ.веÑ.Ñ.Пй сÑ.Ñ.Пке.
+  4. НабеÑ.ОÑ.е 2dd (вспПЌМОÑ.е пÑ.авОлП `Ñ.ОслП-кПЌаМЎа-ПбÑ.екÑ.'), Ñ.Ñ.ПбÑ. Ñ.ЎалОÑ.Ñ.
+     Ўве сÑ.Ñ.ПкО.
+
+      1)  Ð.еÑ.ПЌ я Ñ.ПжÑ. Ма сÑ.аЎОПМ,
+      2)  Ð., как вМезапМП кПМÑ.Олся ЎОваМ!
+      3)  Я бПлеÑ. за ``Ð.еМОÑ.'', ``Ð.еМОÑ.'' --- Ñ.еЌпОПМ!
+      4)  Ð.еÑ.алÑ.МП я гляжÑ. Ма МаÑ.е пПкПлеМОе!
+      5)  Ð.гП гÑ.яЎÑ.Ñ.ее ОлÑ. пÑ.сÑ.П ОлÑ. Ñ.еЌМП...
+      6)  Я сОжÑ. Ма скаЌейке в лПже `Ð.'
+      7)  Ð. ОгÑ.аÑ. Ма бПлÑ.Ñ.Пй жесÑ.яМПй Ñ.Ñ.Ñ.бе.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                          УÑ.Пк 2.5: Ð.Ð.Ð.АНÐ.А `Ð.ТÐ.АТ'
+
+
+  ** НажЌОÑ.е u   Ўля ПÑ.ЌеМÑ. Ñ.езÑ.лÑ.Ñ.аÑ.а Ñ.абПÑ.Ñ. пÑ.еЎÑ.ÐŽÑ.Ñ.ей кПЌаМЎÑ., U Ўля ПÑ.ЌеМÑ.
+                        ОспÑ.авлеМОй вП всей сÑ.Ñ.Пке. **
+
+  1. Ð.еÑ.еЌесÑ.ОÑ.е кÑ.Ñ.сПÑ. вМОз, к сÑ.Ñ.Пке, пПЌеÑ.еММПй ---> О Ñ.сÑ.аМПвОÑ.е егП Ма
+     пеÑ.вÑ.Ñ. ПÑ.ОбкÑ..
+  2. НажЌОÑ.е x Ўля Ñ.ЎалеМОя пеÑ.вПгП МепÑ.авОлÑ.МПгП сОЌвПла.
+  3. ТепеÑ.Ñ. МажЌОÑ.е u Ўля ПÑ.ЌеМÑ. (ПÑ.каÑ.а) пПслеЎМей вÑ.пПлМеММПй кПЌаМЎÑ..
+  4. Ð.спÑ.авÑ.Ñ.е все ПÑ.ОбкО в сÑ.Ñ.Пке, ОспПлÑ.зÑ.я кПЌаМЎÑ. x .
+  5. ТепеÑ.Ñ. МажЌОÑ.е заглавМÑ.Ñ. U Ўля Ñ.ПгП, Ñ.Ñ.ПбÑ. веÑ.ÐœÑ.Ñ.Ñ. всÑ. сÑ.Ñ.ПкÑ. в ОсÑ.ПЎМПе
+     сПсÑ.ПяМОе.
+  6. НажЌОÑ.е u МескПлÑ.кП Ñ.аз Ўля ПÑ.ЌеМÑ. кПЌаМЎÑ. U О пÑ.еЎÑ.ÐŽÑ.Ñ.ОÑ. кПЌаМЎ.
+  7. НажЌОÑ.е Ñ.епеÑ.Ñ. CTRL-R (Ñ.ЎеÑ.жОвайÑ.е клавОÑ.Ñ. CTRL МажаÑ.Пй в ЌПЌеМÑ. МажаÑ.Оя
+  R)     МескПлÑ.кП Ñ.аз Ўля вПзвÑ.аÑ.а кПЌаМЎ (ПÑ.каÑ. ПÑ.каÑ.а).
+
+---> Ð.спÑ.Ñ.авÑ.Ñ.е ППÑ.ОбкО в эÑ.Пйй сÑ.Ñ.Пке О веÑ.МОÑ.Ñ.е ОÑ. сс пПЌПÑ.Ñ.Ñ.Ñ. `ПÑ.каÑ.а'.
+
+  8. ЭÑ.П бÑ.лО ПÑ.еМÑ. пПлезМÑ.е кПЌаМЎÑ.. Ð.алее пеÑ.еÑ.ПЎОÑ.е к РезÑ.Ќе УÑ.Пка 2.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                Ð Ð.Ð.ЮÐ.Ð. УРÐ.Ð.А 2
+
+
+  1. Ð.ля Ñ.ЎалеМОя Ñ.ексÑ.а ПÑ. кÑ.Ñ.сПÑ.а ЎП кПМÑ.а слПва МабеÑ.ОÑ.е:    dw
+
+  2. Ð.ля Ñ.ЎалеМОя Ñ.ексÑ.а ПÑ. кÑ.Ñ.сПÑ.а ЎП кПМÑ.а сÑ.Ñ.ПкО МабеÑ.ОÑ.е:    d$
+
+  3. Ð.ля Ñ.ЎалеМОя всей сÑ.Ñ.ПкО МабеÑ.ОÑ.е:    dd
+
+  4. ЀПÑ.ЌаÑ. кПЌаМЎÑ. в ПбÑ.Ñ.МПЌ Ñ.ежОЌе ОЌееÑ. вОЎ:
+
+       [Ñ.ОслП]   кПЌаМЎа   ПбÑ.екÑ.     Ð.Ð.Ð.     кПЌаМЎа       [Ñ.ОслП]   ПбÑ.екÑ.
+     гЎе:
+       Ñ.ОслП   - скПлÑ.кП Ñ.аз пПвÑ.ПÑ.ОÑ.Ñ. вÑ.пПлМеМОе кПЌаМЎÑ.
+       кПЌаМЎа - Ñ.Ñ.П вÑ.пПлМОÑ.Ñ., МапÑ.ОЌеÑ. d Ўля Ñ.ЎалеМОя
+       ПбÑ.екÑ.  - Ма Ñ.Ñ.П ЎПлжМа вПзЎейсÑ.вПваÑ.Ñ. кПЌаМЎа, МапÑ.ОЌеÑ. w (слПвП),
+                $ (ЎП кПМÑ.а сÑ.Ñ.ПкО), О Ñ..ÐŽ.
+
+  5. Ð.ля ПÑ.ЌеМÑ. (ПÑ.каÑ.а) пÑ.еЎÑ.есÑ.вÑ.Ñ.Ñ.ОÑ. ЎейсÑ.вОй МабеÑ.ОÑ.е:  u (сÑ.Ñ.ПÑ.Мая u)
+     Ð.ля ПÑ.ЌеМÑ. (ПÑ.каÑ.а) всеÑ. ОзЌеМеМОй в сÑ.Ñ.Пке МабеÑ.ОÑ.е:  U (пÑ.ПпОсМая U)
+     Ð.ля ПÑ.ЌеМÑ. ПÑ.каÑ.а МабеÑ.ОÑ.е:  CTRL-R
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                          УÑ.Пк 3.1: Ð.Ð.Ð.АНÐ.А Ð.СТАÐ.Ð.Ð.
+
+
+   ** НабеÑ.ОÑ.е p Ўля всÑ.авкО пПслеЎМегП Ñ.ЎалеММПгП Ñ.ексÑ.а пПсле кÑ.Ñ.сПÑ.а. **
+
+  1. Ð.еÑ.еЌесÑ.ОÑ.е кÑ.Ñ.сПÑ. вМОз к пПслеЎМей сÑ.Ñ.Пке Оз МабПÑ.а.
+
+  2. НабеÑ.ОÑ.е dd Ўля Ñ.ЎалеМОя сÑ.Ñ.ПкО О ее сПÑ.Ñ.аМеМОя в бÑ.Ñ.еÑ.е Vim'а.
+
+  3. Ð.еÑ.еЌесÑ.ОÑ.е кÑ.Ñ.сПÑ. к сÑ.Ñ.Пке НАÐ. Ñ.еЌ ЌесÑ.ПЌ, кÑ.Ўа слеЎÑ.еÑ. всÑ.авОÑ.Ñ.
+     Ñ.ЎалеММÑ.Ñ. сÑ.Ñ.ПкÑ..
+
+  4. НаÑ.ПЎясÑ. в ПбÑ.Ñ.МПЌ Ñ.ежОЌе МабеÑ.ОÑ.е p Ўля заЌеМÑ. сÑ.Ñ.ПкО.
+
+  5. Ð.ПвÑ.ПÑ.ОÑ.е Ñ.агО 2--4, пПка Ме Ñ.ассÑ.авОÑ.е все сÑ.Ñ.ПкО в ÐœÑ.жМПЌ пПÑ.яЎке.
+
+     г) Ð. лÑ.Ñ.Ñ.е вÑ.ÐŽÑ.ЌаÑ.Ñ. Ме ЌПг.
+     б) Ð.ПгЎа Ме в Ñ.Ñ.Ñ.кÑ. заМеЌПг,
+     в) Ð.Ðœ Ñ.важаÑ.Ñ. себя засÑ.авОл
+     а) Ð.Пй ЎяЎя саЌÑ.Ñ. Ñ.есÑ.ÐœÑ.Ñ. пÑ.авОл
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                       УÑ.Пк 3.2: Ð.Ð.Ð.АНÐ.А Ð.АÐ.Ð.НЫ
+
+
+          ** НабеÑ.ОÑ.е r О сОЌвПл, заЌеМяÑ.Ñ.Ой сОЌвПл пПЎ кÑ.Ñ.сПÑ.ПЌ. **
+
+  1. Ð.еÑ.еЌесÑ.ОÑ.е кÑ.Ñ.сПÑ. вМОз, к сÑ.Ñ.Пке, пПЌеÑ.еММПй --->.
+
+  2. УсÑ.аМПвОÑ.е кÑ.Ñ.сПÑ. Ñ.ак, Ñ.Ñ.ПбÑ. ПМ МаÑ.ПЎОлся МаЎ пеÑ.вПй ПÑ.ОбкПй.
+
+  3. НабеÑ.ОÑ.е r О заÑ.еЌ сОЌвПл, ОспÑ.авляÑ.Ñ.Ой ПÑ.ОбкÑ..
+
+  4. Ð.ПвÑ.ПÑ.ОÑ.е Ñ.агО 2 О 3, пПка пеÑ.вая сÑ.Ñ.Пка Ме бÑ.ЎеÑ. ОспÑ.авлеМа.
+
+--->  Ð. ЌПЌегÑ. МабÑ.Ñ.а эÑ.Пй Ñ.Ñ.Ñ.ПкО кПе0кÑ.П с Ñ.Ñ.Ñ.ЎПЌ пПпвЎал пП клваОÑ.аЌ!
+--->  Ð. ЌПЌеМÑ. МабПÑ.а эÑ.Пй сÑ.Ñ.ПкО кПе-кÑ.П с Ñ.Ñ.Ñ.ЎПЌ пПпаЎал пП клавОÑ.аЌ!
+
+  5. ТепеÑ.Ñ. пеÑ.еÑ.ПЎОÑ.е к УÑ.ПкÑ. 3.2.
+
+Ð.АÐ.Ð.ЧАНÐ.Ð.: Ð.ПЌМОÑ.е, Ñ.Ñ.П вÑ. ЎПлжМÑ. Ñ.Ñ.ОÑ.Ñ.ся в пÑ.ПÑ.ессе Ñ.абПÑ.Ñ., а Ме пÑ.ПсÑ.П
+           запПЌОМая.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                         УÑ.Пк 3.3: Ð.Ð.Ð.АНÐ.А Ð.Ð.Ð.Ð.НÐ.НÐ.Я
+
+
+                ** Ð.ля ОзЌеМеМОя Ñ.асÑ.О слПва МабеÑ.ОÑ.е cw . **
+
+  1. Ð.еÑ.еЌесÑ.ОÑ.е кÑ.Ñ.сПÑ. вМОз, к сÑ.Ñ.Пке, пПЌеÑ.еММПй --->.
+
+  2. РаспПлПжОÑ.е кÑ.Ñ.сПÑ. МаЎ бÑ.квПй `o' в слПве `сПла'.
+
+  3. НабеÑ.ОÑ.е cw О ОспÑ.авÑ.Ñ.е слПвП (в ЎаММПЌ слÑ.Ñ.ае, МабеÑ.ОÑ.е `лПв'.)
+
+  4. НажЌОÑ.е <ESC> О пеÑ.еÑ.ПЎОÑ.е к слеЎÑ.Ñ.Ñ.ей ПÑ.Обке (к пеÑ.вПЌÑ. сОЌвПлÑ., кПÑ.ПÑ.Ñ.й
+     МаЎП ОзЌеМОÑ.Ñ..)
+
+  5. Ð.ПвÑ.ПÑ.ОÑ.е Ñ.агО 3--4 пПка пеÑ.вПе пÑ.еЎлПжеМОе Ме сÑ.аМеÑ. ОЎеМÑ.ОÑ.ÐœÑ.ÐŒ вÑ.ПÑ.ПЌÑ..
+
+---> НескПлÑ.кП сПла в эÑ.гÑ. сÑ.Ñ.Пке Ñ.пгÑ.Ñ.бÑ. Ñ.еЎалзкÑ.Ñ.ОесвÑ..
+---> НескПлÑ.кП слПв в эÑ.Пй сÑ.Ñ.Пке Ñ.Ñ.ебÑ.Ñ.Ñ. Ñ.еЎакÑ.ОÑ.ПваМОя.
+
+Ð.бÑ.аÑ.ОÑ.е вМОЌаМОе, Ñ.Ñ.П cw Ме Ñ.ПлÑ.кП заЌеМяеÑ. слПвП, МП О пеÑ.евПЎОÑ. вас в Ñ.ежОЌ
+всÑ.авкО.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                  УÑ.Пк 3.4: Ð.Ð Ð.Ð.Ð.Ð.Ð.АÐ.Ð. Ð.Ð.Ð.Ð.НЯТЬ С Ð.Ð.Ð.АНÐ.Ð.Ð. c
+
+
+** Ð.ПЌаМЎа заЌеМÑ. ОспПлÑ.зÑ.еÑ.ся с Ñ.еЌО же ПбÑ.екÑ.аЌО, Ñ.Ñ.П О кПЌаМЎа Ñ.ЎалеМОя. **
+
+  1. Ð.ПЌаМЎа ОзЌеМеМОя пÑ.ОЌеМяеÑ.ся Ñ.акОЌ же ПбÑ.азПЌ, как О кПЌаМЎа Ñ.ЎалеМОя.
+     Ð.е Ñ.ПÑ.ЌаÑ. Ñ.акПв:
+
+       [Ñ.ОслП]   c   ПбÑ.екÑ.     Ð.Ð.Ð.           c   [Ñ.ОслП]   ПбÑ.екÑ.
+
+  2. Ð.бÑ.екÑ.Ñ. Ñ.акже сПвпаЎаÑ.Ñ.: w (слПвП), $ (кПМеÑ. сÑ.Ñ.ПкО) О Ñ..п.
+
+  3. Ð.еÑ.еЌесÑ.ОÑ.е кÑ.Ñ.сПÑ. вМОз, к сÑ.Ñ.Пке, пПЌеÑ.еММПй --->.
+
+  4. Ð.еÑ.ейЎОÑ.е к пеÑ.вПй ПÑ.Обке.
+
+  5. НабеÑ.ОÑ.е c$ О ПÑ.Ñ.еЎакÑ.ОÑ.Ñ.йÑ.е пеÑ.вÑ.Ñ. сÑ.Ñ.ПкÑ. Ñ.ак, Ñ.Ñ.ПбÑ. ПМа сПвпаЎала сП
+     вÑ.ПÑ.Пй, пПсле Ñ.егП МажЌОÑ.е <ESC>.
+
+---> Ð.ПМеÑ. эÑ.Пй сÑ.Ñ.ПкО ÐœÑ.жЎаеÑ.ся в пПЌПÑ.О, Ñ.Ñ.ПбÑ. сÑ.аÑ.Ñ. пПÑ.ПжОЌ Ма вÑ.ПÑ.Пй.
+---> Ð.ПМеÑ. эÑ.Пй сÑ.Ñ.ПкО ÐœÑ.жЎаеÑ.ся в пПЌПÑ.О кПЌаМЎÑ. c$ .
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                Ð Ð.Ð.ЮÐ.Ð. УРÐ.Ð.А 3
+
+
+  1. Ð.ля всÑ.авкО Ñ.ексÑ.а, кПÑ.ПÑ.Ñ.й Ñ.ПлÑ.кП Ñ.Ñ.П бÑ.л Ñ.ЎалеМ, МабеÑ.ОÑ.е p . ЭÑ.а
+     кПЌаМЎа всÑ.авОÑ. Ñ.ЎалеММÑ.й Ñ.ексÑ. Ð.Ð.СÐ.Ð. кÑ.Ñ.сПÑ.а (еслО бÑ.ла Ñ.ЎалеМа сÑ.Ñ.Пка,
+     Ñ.П ПМа бÑ.ЎеÑ. пПЌеÑ.еМа в сÑ.Ñ.Пке пПЎ кÑ.Ñ.сПÑ.ПЌ).
+
+  2. Ð.ля заЌеМÑ. сОЌвПла пПЎ кÑ.Ñ.сПÑ.ПЌ МабеÑ.ОÑ.е r О заÑ.еЌ заЌеМяÑ.Ñ.Ой сОЌвПл.
+
+  3. Ð.ПЌаМЎа ОзЌеМеМОя пПзвПляеÑ. Ð.аЌ ОзЌеМОÑ.Ñ. Ñ.казаММÑ.й ПбÑ.екÑ. ПÑ. кÑ.Ñ.сПÑ.а ЎП
+     кПМÑ.а эÑ.ПгП ПбÑ.екÑ.а. НапÑ.ОЌеÑ., МабеÑ.ОÑ.е cw Ўля заЌеМÑ. ПÑ. кÑ.Ñ.сПÑ.а ЎП
+     кПМÑ.а слПва, c$ Ўля ОзЌеМеМОя ЎП кПМÑ.а сÑ.Ñ.ПкО.
+
+  4. ЀПÑ.ЌаÑ. кПЌаМЎÑ. ОзЌеМеМОя Ñ.акПв:
+
+         [Ñ.ОслП]   c       ПбÑ.екÑ.          Ð.Ð.Ð.    c   [Ñ.ОслП]   ПбÑ.екÑ.
+
+ТепеÑ.Ñ. ПÑ.пÑ.авляйÑ.есÑ. к слеЎÑ.Ñ.Ñ.еЌÑ. Ñ.Ñ.ПкÑ..
+
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+              УÑ.Пк 4.1: Ð.НЀÐ.Ð Ð.АЊÐ.Я Ð. ЀАÐ.Ð.Ð. Ð. РАСÐ.Ð.Ð.Ð.Ð.Ð.НÐ.Ð. Ð. НÐ.Ð.
+
+
+ ** НабеÑ.ОÑ.е CTRL-g Ñ.Ñ.ПбÑ. Ñ.вОЎеÑ.Ñ. Ð.аÑ.е ЌесÑ.ПÑ.аспПлПжеМОе в Ñ.айле О ОМÑ.ПÑ.ЌаÑ.ОÑ.
+                                    П МеЌ.
+        НабеÑ.ОÑ.е SHIFT-G Ўля пеÑ.еЌеÑ.еМОя к заЎаММПй сÑ.Ñ.Пке в Ñ.айле. **
+
+  Ð.аЌеÑ.аМОе: Ð.Ñ.ПÑ.ОÑ.айÑ.е весÑ. Ñ.Ñ.Пк пÑ.ежЎе Ñ.еЌ вÑ.пПлМяÑ.Ñ. лÑ.бÑ.е кПЌаМЎÑ.!!
+
+  1. УЎеÑ.жОвая клавОÑ.Ñ. Ctrl МажЌОÑ.е g . Ð.МОзÑ. экÑ.аМа пПявОÑ.ся сÑ.Ñ.Пка сÑ.аÑ.Ñ.са с
+     ОЌеМеЌ Ñ.айла О МПЌеÑ.ПЌ сÑ.Ñ.ПкО, в кПÑ.ПÑ.Пй Ð.Ñ. МаÑ.ПЎОÑ.есÑ.. Ð.апПЌМОÑ.е МПЌеÑ.
+     сÑ.Ñ.ПкО, ПМ пПÑ.Ñ.ебÑ.еÑ.ся Ма Каге 3.
+
+  2. НажЌОÑ.е shift-G Ўля пеÑ.еЌеÑ.еМОя к кПМÑ.Ñ. Ñ.айла.
+
+  3. НабеÑ.ОÑ.е МПЌеÑ. сÑ.Ñ.ПкО, в кПÑ.ПÑ.Пй вÑ. МаÑ.ПЎОлОсÑ. О заÑ.еЌ shift-G. ЭÑ.П
+     веÑ.МеÑ. Ð.ас к сÑ.Ñ.Пке, в кПÑ.ПÑ.Пй Ð.Ñ. бÑ.лО, кПгЎа в пеÑ.вÑ.й Ñ.аз МажалО Ctrl-g.
+     (Ð.ПгЎа Ð.Ñ. бÑ.ЎеÑ.е МабОÑ.аÑ.Ñ. Ñ.ОÑ.Ñ.Ñ., ПМО НÐ. ПÑ.ПбÑ.азяÑ.ся Ма экÑ.аМе.)
+
+  4. Ð.слО Ð.Ñ. запПЌМОлО все вÑ.Ñ.есказаММПе, вÑ.пПлМОÑ.е Ñ.агО 1--3.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                           УÑ.Пк 4.2: Ð.Ð.Ð.АНÐ.А Ð.Ð.Ð.СÐ.А
+
+              ** НабеÑ.ОÑ.е  /  О заÑ.еЌ ввеЎОÑ.е ОскПЌÑ.Ñ. Ñ.Ñ.азÑ.. **
+
+  1. Ð. ПбÑ.Ñ.МПЌ Ñ.ежОЌе (Normal mode) МабеÑ.ОÑ.е сОЌвПл  / . Ð.бÑ.аÑ.ОÑ.е вМОЌаМОе,
+     Ñ.Ñ.П ПМ вЌесÑ.е с кÑ.Ñ.сПÑ.ПЌ пПявОÑ.ся вМОзÑ. экÑ.аМа, как эÑ.П пÑ.ПОсÑ.ПЎОÑ. с
+     кПЌаМЎПй : .
+
+  2. ТепеÑ.Ñ. МабеÑ.ОÑ.е 'ПÑ.Ñ.Ñ.Обка' <ENTER>. ЭÑ.П Ñ.П слПвП, кПÑ.ПÑ.Пе Ð.Ñ. бÑ.ЎеÑ.е
+     ОскаÑ.Ñ..
+
+  3. Ð.ля Ñ.ПгП, Ñ.Ñ.ПбÑ. пПвÑ.ПÑ.ОÑ.Ñ. пПОск, пÑ.ПсÑ.П МажЌОÑ.е n .
+     Ð.ля пПОска эÑ.Пй Ñ.Ñ.азÑ. в ПбÑ.аÑ.МПЌ МапÑ.авлеМОО, МажЌОÑ.е Shift-N .
+
+  4. Ð.слО Ð.Ñ. желаеÑ.е сÑ.азÑ. ОскаÑ.Ñ. в ПбÑ.аÑ.МПЌ МапÑ.авлеМОО, ОспПлÑ.зÑ.йÑ.е
+     кПЌаМЎÑ. ? вЌесÑ.П / .
+
+---> Ð.ПгЎа Ð.Ñ. пÑ.О пПОске ЎПсÑ.ОгМеÑ.е кПМÑ.а Ñ.айла, пПОск бÑ.ЎеÑ. пÑ.ПЎПлжеМ с
+     МаÑ.ала.
+
+  "ПÑ.Ñ.Ñ.Обка" эÑ.П Ме спПсПб пÑ.ПОзМесеМОя слПва `ПÑ.Обка';  ПÑ.Ñ.Ñ.Обка эÑ.П ПÑ.Обка.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        УÑ.Пк 4.3: Ð.Ð.Ð.СÐ. Ð.АРНЫХ СÐ.Ð.Ð.Ð.Ð.
+
+
+                ** НабеÑ.ОÑ.е % Ўля пПОска паÑ.ÐœÑ.Ñ. ),] ОлО } . **
+
+  1. Ð.ПЌесÑ.ОÑ.е кÑ.Ñ.сПÑ. МаЎ лÑ.бПй Оз (, [ ОлО { в сÑ.Ñ.Пке вМОзÑ., пПЌеÑ.еММПй --->.
+
+  2. ТепеÑ.Ñ. МабеÑ.ОÑ.е сОЌвПл % .
+
+  3. Ð.Ñ.Ñ.сПÑ. ЎПлжеМ пеÑ.ескПÑ.ОÑ.Ñ. Ма паÑ.ÐœÑ.Ñ. скПбкÑ..
+
+  4. НабеÑ.ОÑ.е % Ўля вПзвÑ.аÑ.а кÑ.Ñ.сПÑ.а МазаЎ к пеÑ.вПй скПбке.
+
+---> ЭÑ.П ( сÑ.Ñ.Пка, сПЎеÑ.жаÑ.ая Ñ.акОе (, Ñ.акОе [ ] О Ñ.акОе { } скПбкО. ))
+
+Ð.аЌеÑ.аМОе: ЭÑ.П ПÑ.еМÑ. Ñ.ЎПбМП пÑ.О ПÑ.лаЎке пÑ.ПгÑ.аЌЌ с пÑ.ПпÑ.Ñ.еММÑ.ЌО скПбкаЌО!
+
+
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                      УÑ.Пк 4.4: СÐ.Ð.СÐ.Ð. Ð.СÐ.РАÐ.Ð.Ð.НÐ.Я Ð.КÐ.Ð.Ð.Ð.
+
+
+         ** НабеÑ.ОÑ.е :s/бÑ.лП/сÑ.алП/g Ўля заЌеМÑ. 'бÑ.лП' Ма 'сÑ.алП'. **
+
+  1. Ð.еÑ.еЌесÑ.ОÑ.е кÑ.Ñ.сПÑ. вМОз, к сÑ.Ñ.Пке, пПЌеÑ.еММПй --->.
+
+  2. НабеÑ.ОÑ.е :s/Ñ.вПЎÑ./Ñ.вПжÑ. <ENTER> . Ð.бÑ.аÑ.ОÑ.е вМОЌаМОе Ма Ñ.П, Ñ.Ñ.П эÑ.а кПЌаМЎа
+     заЌеМОÑ. Ñ.ПлÑ.кП пеÑ.вПе МайЎеММПе вÑ.ПжЎеМОе в сÑ.Ñ.Пке.
+
+  3. ТепеÑ.Ñ. МабеÑ.ОÑ.е :s/Ñ.вПЎÑ./Ñ.вПжÑ./g , ПзМаÑ.аÑ.Ñ.ее пПЎсÑ.аМПвкÑ. глПбалÑ.МП вП
+     всей сÑ.Ñ.Пке. ЭÑ.П заЌеМОÑ. все МайЎеММÑ.е в сÑ.Ñ.Пке вÑ.ПжЎеМОя.
+
+---> Я Ñ.вПЎÑ. к ПÑ.веÑ.жеММÑ.ÐŒ селеМÑ.яЌ, я Ñ.вПЎÑ. сквПзÑ. векПвеÑ.ÐœÑ.й сÑ.ПМ, я Ñ.вПЎÑ. к
+     забÑ.Ñ.Ñ.ÐŒ пПкПлеМÑ.яЌ.
+
+  4. Ð.ля заЌеМÑ. всеÑ. вÑ.ПжЎеМОй пПслеЎПваÑ.елÑ.МПсÑ.О сОЌвПлПв ЌежЎÑ. ЎвÑ.Ќя
+     сÑ.Ñ.ПкаЌО,
+     МабеÑ.ОÑ.е :#,#s/бÑ.лП/сÑ.алП/g  гЎе #,# --- МПЌеÑ.а эÑ.ОÑ. сÑ.Ñ.Пк.
+     НабеÑ.ОÑ.е :%s/бÑ.лП/сÑ.алП/g    Ўля заЌеМÑ. всеÑ. вÑ.ПжЎеМОй вП всеЌ Ñ.айле.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                Ð Ð.Ð.ЮÐ.Ð. УРÐ.Ð.А 4
+  1. Ctrl-g пПказÑ.ваеÑ. ваÑ.е пПлПжеМОе в Ñ.айле О ОМÑ.ПÑ.ЌаÑ.ОÑ. П МеЌ.
+     Shift-G пеÑ.еЌеÑ.аеÑ. Ð.ас в кПМеÑ. Ñ.айла. НПЌеÑ., за кПÑ.ПÑ.Ñ.ÐŒ слеЎÑ.еÑ. Shift-G
+     пПзвПляеÑ. пеÑ.ейÑ.О к сÑ.Ñ.Пке с эÑ.ОЌ МПЌеÑ.ПЌ.
+
+  2. НажаÑ.Ое / О заÑ.еЌ ввПЎ сÑ.Ñ.ПкО пПзвПляеÑ. пÑ.ПОзвесÑ.О пПОск эÑ.Пй сÑ.Ñ.ПкО
+     Ð.Ð.Ð.Ð Ð.Ð. пП Ñ.ексÑ.Ñ..
+     НажаÑ.Ое ? О заÑ.еЌ ввПЎ сÑ.Ñ.ПкО пПзвПляеÑ. пÑ.ПОзвесÑ.О пПОск эÑ.Пй сÑ.Ñ.ПкО
+     НАÐ.АÐ. пП Ñ.ексÑ.Ñ..
+     Ð.Псле пПОска МабеÑ.ОÑ.е n Ўля пеÑ.еÑ.ПЎа к слеЎÑ.Ñ.Ñ.еЌÑ. вÑ.ПжЎеМОÑ. ОскПЌПй
+     сÑ.Ñ.ПкО в Ñ.ПЌ же МапÑ.авлеМОО ОлО Shift-N Ўля пеÑ.еÑ.ПЎа в пÑ.ПÑ.ОвПпПлПжМПЌ
+     МапÑ.авлеМОО.
+
+  3. НажаÑ.Ое % , кПгЎа кÑ.Ñ.сПÑ. МаÑ.ПЎОÑ.ся Ма (,),[,],{, ОлО } пПзвПляеÑ. МайÑ.О
+     паÑ.ÐœÑ.Ñ. скПбкÑ..
+
+  4. Ð.ля пПЎсÑ.аМПвкО `сÑ.алП' вЌесÑ.П пеÑ.вПгП `бÑ.лП' в сÑ.Ñ.Пке, МабеÑ.ОÑ.е
+     :s/old/new
+     Ð.ля пПЎсÑ.аМПвкО `сÑ.алП' вЌесÑ.П всеÑ. `бÑ.лП' в сÑ.Ñ.Пке, МабеÑ.ОÑ.е
+     :s/old/new/g
+     Ð.ля заЌеМÑ. в ОМÑ.еÑ.вале ЌежЎÑ. ЎвÑ.Ќя сÑ.Ñ.ПкаЌО, МабеÑ.ОÑ.е
+     :#,#s/old/new/g
+     Ð.ля заЌеМÑ. всеÑ. вÑ.ПжЎеМОй `бÑ.лП' Ма `сÑ.алП' в Ñ.айле, МабеÑ.ОÑ.е
+     :%s/old/new/g
+     ЧÑ.ПбÑ. Ñ.еЎакÑ.ПÑ. кажЎÑ.й Ñ.аз запÑ.аÑ.Овал пПЎÑ.веÑ.жЎеМОе, ЎПбавÑ.Ñ.е 'c'
+     :%s/old/new/gc
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                   УÑ.Пк 5.1: Ð.АÐ. Ð.ЫÐ.Ð.Ð.НÐ.ТЬ Ð.НÐ.КНЮЮ Ð.Ð.Ð.АНÐ.У
+
+
+    ** НабеÑ.ОÑ.е :! О заÑ.еЌ вМеÑ.ÐœÑ.Ñ. кПЌаМЎÑ., кПÑ.ПÑ.Ñ.Ñ. слеЎÑ.еÑ. вÑ.пПлМОÑ.Ñ.. **
+
+  1. НабеÑ.ОÑ.е Ñ.же зМакПЌÑ.Ñ. Ð.аЌ кПЌаМЎÑ. : Ўля Ñ.сÑ.аМПвкО кÑ.Ñ.сПÑ.а в кПЌаМЎМÑ.Ñ.
+     сÑ.Ñ.ПкÑ. Ñ.еЎакÑ.ПÑ.а. ЭÑ.П пПзвПлОÑ. Ð.аЌ ввесÑ.О кПЌаМЎÑ..
+
+  2. ТепеÑ.Ñ. МабеÑ.ОÑ.е сОЌвПл ! (вПсклОÑ.аÑ.елÑ.ÐœÑ.й зМак). ТепеÑ.Ñ. ЌПжМП ОспПлМОÑ.Ñ.
+     вМеÑ.ÐœÑ.Ñ. кПЌаМЎÑ., ОспПлÑ.зÑ.я кПЌаМЎМÑ.Ñ. ПбПлПÑ.кÑ..
+
+  3. Ð.ля пÑ.ОЌеÑ.а МабеÑ.ОÑ.е ls пПсле ! О МажЌОÑ.е <ENTER>. ЭÑ.а кПЌаМЎа вÑ.веЎеÑ.
+     спОсПк Ñ.айлПв в Ñ.екÑ.Ñ.еЌ каÑ.алПге, Ñ.ПÑ.МП Ñ.акже, как еслО бÑ. Ð.Ñ. ввелО эÑ.Ñ.
+     кПЌаМЎÑ. в пÑ.ОглаÑ.еМОО ПбПлПÑ.кО. Ð.лО пПпÑ.ПбÑ.йÑ.е :!dir , еслО пÑ.еЎÑ.ÐŽÑ.Ñ.ая
+     кПЌаМЎа Ме сÑ.абПÑ.ала.
+
+---> Ð.аЌеÑ.аМОе: ТакОЌ спПсПбПЌ ЌПжМП вÑ.пПлМОÑ.Ñ. лÑ.бÑ.Ñ. вМеÑ.ÐœÑ.Ñ. кПЌаМЎÑ..
+
+---> Ð.аЌеÑ.аМОе: Ð.се кПЌаМЎÑ., МаÑ.ОМаÑ.Ñ.Оеся с : , ЎПлжМÑ. завеÑ.Ñ.аÑ.Ñ.ся МажаÑ.ОеЌ
+     <ENTER>.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                         УÑ.Пк 5.2: Ð.АÐ. Ð.АÐ.Ð.САТЬ ЀАÐ.Ð.
+
+
+** Ð.ля сПÑ.Ñ.аМеМОя ОзЌеМеМОй, пÑ.ПОзвеЎеММÑ.Ñ. в Ñ.айле, МабеÑ.ОÑ.е :w Ð.Ð.Я_ЀАÐ.Ð.А. **
+
+  1. НабеÑ.ОÑ.е :!dir ОлО :!ls Ўля пПлÑ.Ñ.еМОя спОска Ñ.айлПв в Ñ.екÑ.Ñ.еЌ каÑ.алПге.
+     Ð.ак Ð.аЌ Ñ.же ОзвесÑ.МП, Ð.Ñ. ЎПлжМÑ. МажаÑ.Ñ. <ENTER> пПсле ввПЎа эÑ.ОÑ. кПЌаМЎ.
+
+  2. Ð.Ñ.ОЎÑ.ЌайÑ.е МазваМОе Ўля Ñ.айла, кПÑ.ПÑ.Пе еÑ.е Ме сÑ.Ñ.есÑ.вÑ.еÑ., МапÑ.ОЌеÑ. TEST.
+
+  3. ТепеÑ.Ñ. МабеÑ.ОÑ.е :w TEST (гЎе TEST --- эÑ.П ОЌя Ñ.айла, пÑ.ОЎÑ.ЌаММПе Ð.аЌО.)
+
+  4. ЭÑ.а кПЌаМЎа сПÑ.Ñ.аМОÑ. весÑ. Ñ.айл (УÑ.ебМОк пП Vim) пПЎ ОЌеМеЌ TEST. ЧÑ.ПбÑ.
+     Ñ.ЎПсÑ.ПвеÑ.ОÑ.Ñ.ся в эÑ.ПЌ, сМПва МабеÑ.ОÑ.е :!dir О пÑ.ПсЌПÑ.Ñ.ОÑ.е каÑ.алПг.
+
+---> Ð.аЌеÑ.Ñ.Ñ.е, Ñ.Ñ.П еслО Ð.Ñ. вÑ.йЎеÑ.е Оз Vim О заÑ.еЌ запÑ.сÑ.ОÑ.е егП сМПва с
+     Ñ.айлПЌ TEST, эÑ.ПÑ. Ñ.айл бÑ.ЎеÑ. Ñ.ПÑ.МПй кПпОей Ñ.Ñ.ебМОка в Ñ.ПÑ. ЌПЌеМÑ., кПгЎа
+     Ð.Ñ. егП сПÑ.Ñ.аМОлО.
+
+  5. ТепеÑ.Ñ. Ñ.ЎалОÑ.е эÑ.ПÑ. Ñ.айл, МабÑ.ав :!del TEST
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                       УÑ.Пк 5.3: Ð.ЫÐ.Ð.Ð Ð.ЧНÐ.Ð. СÐ.ХРАНÐ.НÐ.Ð.
+
+
+         ** Ð.ля сПÑ.Ñ.аМеМОя Ñ.асÑ.О Ñ.айла, МабеÑ.ОÑ.е :#,# w Ð.Ð.Я_ЀАÐ.Ð.А **
+
+  1. Ð.Ñ.е Ñ.аз МабеÑ.ОÑ.е :!dir ОлО :!ls Ўля пПлÑ.Ñ.еМОя спОска Ñ.айлПв в Ñ.екÑ.Ñ.еЌ
+     каÑ.алПге О вÑ.беÑ.ОÑ.е пПЎÑ.ПЎяÑ.ее ОЌя, МапÑ.ОЌеÑ. TEST.
+
+  2. Ð.еÑ.еЌесÑ.ОÑ.е кÑ.Ñ.сПÑ. к МаÑ.алÑ. эÑ.Пй сÑ.Ñ.аМОÑ.Ñ. О МажЌОÑ.е Ctrl-g Ўля МаÑ.ПжЎеМОя
+     МПЌеÑ.а сÑ.Ñ.ПкОto. Ð.АÐ.Ð.Ð.НÐ.ТÐ. ЭТÐ.Т НÐ.Ð.Ð.Ð !
+
+  3. ТепеÑ.Ñ. пеÑ.еЌесÑ.ОÑ.есÑ. в кПМеÑ. сÑ.Ñ.аМОÑ.Ñ. О вМПвÑ. МабеÑ.ОÑ.е Ctrl-g. Ð.АÐ.Ð.Ð.НÐ.ТÐ.
+     Ð. ЭТÐ.Т НÐ.Ð.Ð.Ð  ТÐ.Ð.Ð.!
+
+  4. Ð.ля сПÑ.Ñ.аМеМОя ТÐ.Ð.ЬÐ.Ð. ЧАСТÐ. Ñ.айла МабеÑ.ОÑ.е :#,# w TEST , гЎе #,# --- эÑ.П
+     МПЌеÑ.а, кПÑ.ПÑ.Ñ.е Ð.Ñ. запПЌМОлО (МаÑ.алП, кПМеÑ.), а TEST --- ОЌя ваÑ.егП Ñ.айла.
+
+  5. Ð.ак О пÑ.ежЎе, Ñ.беЎОÑ.есÑ. в МалОÑ.ОО эÑ.ПгП Ñ.айла кПЌаМЎПй :!dir , МП НÐ.
+     УÐ.АÐ.ЯÐ.ТÐ. егП.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    УÑ.Пк 5.4: ЧТÐ.НÐ.Ð. Ð. Ð.Ð.ЪÐ.Ð.Ð.НÐ.НÐ.Ð. ЀАÐ.Ð.Ð.Ð.
+
+          ** Ð.ля всÑ.авкО сПЎеÑ.жОЌПгП Ñ.айла, МабеÑ.ОÑ.е  :r FILENAME **
+
+  1. НабеÑ.ОÑ.е :!dir Ўля Ñ.ПгП, Ñ.Ñ.ПбÑ. Ñ.беЎОÑ.Ñ.ся в Ñ.ПЌ, Ñ.Ñ.П Ñ.айл TEST все еÑ.е
+     сÑ.Ñ.есÑ.вÑ.еÑ..
+
+  2. УсÑ.аМПвОÑ.е кÑ.Ñ.сПÑ. в веÑ.Ñ.Мей Ñ.асÑ.О эÑ.Пй сÑ.Ñ.аМОÑ.Ñ..
+
+Ð.аЌеÑ.аМОе: Ð.Псле вÑ.пПлМеМОя Ñ.ага 3 Ð.Ñ. Ñ.вОЎОÑ.е УÑ.Пк 5.3.        Ð.Псле эÑ.ПгП
+           пеÑ.еЌеÑ.айÑ.есÑ. Ð.НÐ.Ð., сМПва к эÑ.ПЌÑ. Ñ.Ñ.ПкÑ..
+
+  3. ТепеÑ.Ñ. пÑ.ПÑ.ОÑ.айÑ.е Ð.аÑ. Ñ.айл TEST, ОспПлÑ.зÑ.я кПЌаМЎÑ. :r TEST , гЎе
+     TEST --- эÑ.П ОЌя Ñ.айла.
+
+Ð.аЌеÑ.аМОе: Ð.Ñ.ПÑ.ОÑ.аММÑ.й Ð.аЌО Ñ.айл бÑ.ЎеÑ. всÑ.авлеМ в Ñ.ПЌ ЌесÑ.е, гЎе МаÑ.ПЎОÑ.ся
+           кÑ.Ñ.сПÑ..
+
+  4. ЧÑ.ПбÑ. Ñ.беЎОÑ.Ñ.ся в Ñ.ПЌ, Ñ.Ñ.П Ñ.айл пÑ.ПÑ.ОÑ.аМ, пеÑ.еЌесÑ.ОÑ.есÑ. МеЌМПгП МазаЎ пП
+     Ñ.ексÑ.Ñ. О заЌеÑ.Ñ.Ñ.е, Ñ.Ñ.П Ñ.епеÑ.Ñ. сÑ.Ñ.есÑ.вÑ.Ñ.Ñ. Ўве кПпОО УÑ.Пка 5.3, ОсÑ.ПЎМая
+     О пПлÑ.Ñ.еММая Оз Ñ.айла.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                Ð Ð.Ð.ЮÐ.Ð. УРÐ.Ð.А 5
+
+
+  1.  :!кПЌаМЎа  ОспПлМяеÑ. вМеÑ.ÐœÑ.Ñ. кПЌаМЎÑ..
+
+      НекПÑ.ПÑ.Ñ.е пПлезМÑ.е пÑ.ОЌеÑ.Ñ.:
+          :!dir --- вÑ.вПЎОÑ. спОсПк Ñ.айлПв в каÑ.алПге.
+          :!del FILENAME --- Ñ.ЎаляеÑ. Ñ.айл FILENAME.
+
+  2.  :w FILENAME запОсÑ.ваеÑ. Ñ.екÑ.Ñ.Ой Ñ.еЎакÑ.ОÑ.Ñ.еЌÑ.й Ñ.айл Ма ЎОск
+      пПЎ ОЌеМеЌ FILENAME.
+
+  3.  :#,#w FILENAME сПÑ.Ñ.аМяеÑ. сÑ.Ñ.ПкО ПÑ. # ЎП # в Ñ.айл FILENAME.
+
+  4.  :r FILENAME сÑ.ОÑ.Ñ.ваеÑ. с ЎОска Ñ.айл FILENAME О пПЌеÑ.аеÑ. егП в Ñ.екÑ.Ñ.Ой
+      Ñ.айл слеЎПЌ за пПзОÑ.Оей кÑ.Ñ.сПÑ.а.
+
+
+
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                          УÑ.Пк 6.1: Ð.Ð.Ð.АНÐ.А СÐ.Ð.Ð.АНÐ.Я
+
+
+ ** НабеÑ.ОÑ.е o Ñ.Ñ.ПбÑ. сПзЎаÑ.Ñ. пÑ.сÑ.Ñ.Ñ. сÑ.Ñ.ПкÑ. пПЎ кÑ.Ñ.сПÑ.ПЌ О пеÑ.ейÑ.О в Ñ.ежОЌ
+                           всÑ.авкО (Insert mode) **
+
+  1. Ð.еÑ.еЌесÑ.ОÑ.е кÑ.Ñ.сПÑ. вМОз, к сÑ.Ñ.Пке, пПЌеÑ.еММПй --->.
+
+  2. НабеÑ.ОÑ.е o (в МОжМеЌ Ñ.егОсÑ.Ñ.е) Ўля Ñ.ПгП, Ñ.Ñ.ПбÑ. сПзЎаÑ.Ñ. пÑ.сÑ.Ñ.Ñ. сÑ.Ñ.ПкÑ.
+     НÐ.Ð.Ð. кÑ.Ñ.сПÑ.а О пеÑ.ейÑ.О в Ñ.ежОЌ всÑ.авкО (Insert mode).
+
+  3. ТепеÑ.Ñ. скПпОÑ.Ñ.йÑ.е пПЌеÑ.еММÑ.Ñ. ---> сÑ.Ñ.ПкÑ. О МажЌОÑ.е <ESC> Ўля вÑ.Ñ.ПЎа Оз
+     Ñ.ежОЌа всÑ.авкО.
+
+---> Ð.Псле МажаÑ.Оя o кÑ.Ñ.сПÑ. пеÑ.ейЎеÑ. Ма МПвÑ.Ñ. пÑ.сÑ.Ñ.Ñ. сÑ.Ñ.ПкÑ. в Ñ.ежОЌе всÑ.авкО.
+
+  4. Ð.ля сПзЎаМОя сÑ.Ñ.ПкО Ð.ЫКÐ. кÑ.Ñ.сПÑ.а, пÑ.ПсÑ.П МабеÑ.ОÑ.е заглавМÑ.Ñ. O, вЌесÑ.П
+     сÑ.Ñ.ПÑ.МПй o. Ð.ПпÑ.ПбÑ.йÑ.е пÑ.ПЎелаÑ.Ñ. эÑ.П с МОжеслеЎÑ.Ñ.Ñ.ей сÑ.Ñ.ПкПй.
+СПзЎайÑ.е МПвÑ.Ñ. сÑ.Ñ.ПкÑ. МаЎ эÑ.Пй, Мажав Shift-O, пПЌесÑ.Ов кÑ.Ñ.сПÑ. Ма эÑ.Ñ. сÑ.Ñ.ПкÑ..
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                         УÑ.Пк 6.2: Ð.Ð.Ð.АНÐ.А Ð.Ð.Ð.АÐ.Ð.Ð.НÐ.Я
+
+            ** НабеÑ.ОÑ.е a , Ñ.Ñ.ПбÑ. всÑ.авОÑ.Ñ. Ñ.ексÑ. Ð.Ð.СÐ.Ð. кÑ.Ñ.сПÑ.а. **
+
+  1. Ð.еÑ.еЌесÑ.ОÑ.е кÑ.Ñ.сПÑ. вМОз, в кПМеÑ. пеÑ.вПй сÑ.Ñ.ПкО, пПЌеÑ.еММПй ---> ,
+     МабÑ.ав $ в ПбÑ.Ñ.МПЌ Ñ.ежОЌе (Normal mode).
+
+  2. НабеÑ.ОÑ.е a (в МОжМеЌ Ñ.егОсÑ.Ñ.е) Ўля ЎПбавлеМОя Ñ.ексÑ.а Ð.Ð.СÐ.Ð. сОЌвПла,
+     МаÑ.ПЎяÑ.егПся пПЎ кÑ.Ñ.сПÑ.ПЌ. (Ð.аглавМая A пПзвПляеÑ. ЎПбавОÑ.Ñ. в кПМеÑ.
+     сÑ.Ñ.ПкО.)
+
+Ð.аЌеÑ.аМОе: ЭÑ.П пПзвПляеÑ. ОзбежаÑ.Ñ. МажаÑ.Оя i , пПслеЎМегП сОЌвПла, Ñ.ексÑ.а Ўля
+           всÑ.авкО, <ESC>, кÑ.Ñ.сПÑ.-впÑ.авП, О, МакПМеÑ., x , пÑ.ПсÑ.П Ўля Ñ.ПгП,
+           Ñ.Ñ.ПбÑ. ЎПбавОÑ.Ñ. Ñ.есÑ. в кПМеÑ. сÑ.Ñ.ПкО!
+
+  3. ТепеÑ.Ñ. завеÑ.Ñ.ОÑ.е пеÑ.вÑ.Ñ. сÑ.Ñ.ПкÑ.. Ð.аЌеÑ.Ñ.Ñ.е Ñ.акже, Ñ.Ñ.П ЎПбавлеМОе эÑ.П в
+     Ñ.ПÑ.МПсÑ.О Ñ.П же саЌПе, Ñ.Ñ.П О Ñ.ежОЌ всÑ.авкО, за ОсклÑ.Ñ.еМОеЌ пПзОÑ.ОО, в
+     кПÑ.ПÑ.Ñ.Ñ. бÑ.ЎеÑ. всÑ.авлеМ Ñ.ексÑ..
+
+---> ЭÑ.а сÑ.Ñ.ПÑ.ка пПзвПлОÑ. Ð.аЌ пПпÑ.акÑ.ОкПваÑ.Ñ.ся
+---> ЭÑ.а сÑ.Ñ.ПÑ.ка пПзвПлОÑ. Ð.аЌ пПпÑ.акÑ.ОкПваÑ.Ñ.ся в ЎПбавлеМОО Ñ.ексÑ.а в кПМеÑ.
+     сÑ.Ñ.ПкО.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                       УÑ.Пк 6.3: Ð.ЩÐ. Ð.Ð.Ð.Н СÐ.Ð.СÐ.Ð. Ð.АÐ.Ð.НЫ
+
+
+       ** НабеÑ.ОÑ.е заглавМÑ.Ñ. R Ўля заЌеМÑ. бПлее, Ñ.еЌ ПЎМПгП сОЌвПла. **
+
+  1. Ð.еÑ.еЌесÑ.ОÑ.е кÑ.Ñ.сПÑ. вМОз, к сÑ.Ñ.Пке, пПЌеÑ.еММПй --->.
+
+  2. РаспПлПжОÑ.е кÑ.Ñ.сПÑ. в МаÑ.але пеÑ.вПгП слПва, ПÑ.лОÑ.аÑ.Ñ.егПся ПÑ.
+     сППÑ.веÑ.сÑ.вÑ.Ñ.Ñ.егП в слеЎÑ.Ñ.Ñ.ей сÑ.Ñ.Пке, пПЌеÑ.еММПй ---> (слПвП 'пПслеЎМей').
+
+  3. ТепеÑ.Ñ. МабеÑ.ОÑ.е R О заЌеМОÑ.е ПсÑ.аÑ.Пк Ñ.ексÑ.а в пеÑ.вПй сÑ.Ñ.Пке, МабÑ.ав
+     пПвеÑ.Ñ. сÑ.аÑ.ПгП Ñ.ексÑ.а Ñ.ак, Ñ.Ñ.ПбÑ. Пбе сÑ.Ñ.ПкО сÑ.алО ПЎОМакПвÑ.ЌО.
+
+---> Ð.еÑ.вÑ.Ñ. сÑ.Ñ.ПкÑ. ЌПжМП сÑ.авМяÑ.Ñ. с пПслеЎМей, ОспПлÑ.зÑ.я клавОÑ.О.
+---> Ð.еÑ.вÑ.Ñ. сÑ.Ñ.ПкÑ. ЌПжМП сÑ.авМяÑ.Ñ. с вÑ.ПÑ.Пй, ОспПлÑ.зÑ.я R О МабÑ.ав МПвÑ.й Ñ.ексÑ..
+
+  4. Ð.бÑ.аÑ.ОÑ.е вМОЌаМОе, Ñ.Ñ.П пÑ.О МажаÑ.ОО <ESC> Ўля завеÑ.Ñ.еМОя, лÑ.бПй
+     Ме ОзЌеМеММÑ.й Ñ.ексÑ. сПÑ.Ñ.аМОÑ.ся.
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        УÑ.Пк 6.4: УСТАНÐ.Ð.Ð.А Ð.АРАÐ.Ð.ТРÐ.Ð.
+
+
+** УсÑ.аМПвОЌ паÑ.аЌеÑ.Ñ.Ñ. Ñ.ак, Ñ.Ñ.ПбÑ. ОгМПÑ.ОÑ.ПваÑ.Ñ. Ñ.егОсÑ.Ñ. пÑ.О пПОске ОлО заЌеМе **
+
+
+  1. Ð.ПОÑ.ОÑ.е слПвП 'ОгМПÑ.ОÑ.ПваÑ.Ñ.', МабÑ.ав:
+     /ОгМПÑ.ОÑ.ПваÑ.Ñ.
+     Ð.ПвÑ.ПÑ.ОÑ.е пПОск МескПлÑ.кП Ñ.аз, МажОЌая клавОÑ.Ñ. n
+
+  2. Ð.клÑ.Ñ.ОÑ.е паÑ.аЌеÑ.Ñ. 'ic' (Ð.гМПÑ.ОÑ.ПваÑ.Ñ. Ñ.егОсÑ.Ñ.), МабÑ.ав:
+     :set ic
+
+  3. ТепеÑ.Ñ. сМПва сЎелайÑ.е пПОск слПва 'ОгМПÑ.ОÑ.ПваÑ.Ñ.', Мажав: n
+     Ð.ПвÑ.ПÑ.ОÑ.е пПОск МескПлÑ.кП Ñ.аз, МажОЌая клавОÑ.Ñ. n
+
+  4. Ð.клÑ.Ñ.ОÑ.е паÑ.аЌеÑ.Ñ.Ñ. 'hlsearch' О 'incsearch':
+     :set hls is
+
+  5. ТепеÑ.Ñ. ПпяÑ.Ñ. ввеЎОÑ.е кПЌаМЎÑ. пПОска О пПсЌПÑ.Ñ.ОÑ.е, Ñ.Ñ.П пПлÑ.Ñ.ОÑ.ся:
+     /ОгМПÑ.ОÑ.ПваÑ.Ñ.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                Ð Ð.Ð.ЮÐ.Ð. УРÐ.Ð.А 6
+
+
+  1. НажаÑ.Ое o сПзЎаеÑ. сÑ.Ñ.ПкÑ. НÐ.Ð.Ð. кÑ.Ñ.сПÑ.а О пеÑ.еЌеÑ.аеÑ. кÑ.Ñ.сПÑ. в Мее в Ñ.ежОЌе
+     всÑ.авкО.
+     НажаÑ.Ое заглавМПй O сПзЎаеÑ. сÑ.Ñ.ПкÑ. Ð.ЫКÐ. сÑ.Ñ.ПкО, в кПÑ.ПÑ.Пй МаÑ.ПЎОÑ.ся
+     кÑ.Ñ.сПÑ..
+
+  2. НабеÑ.ОÑ.е a Ўля всÑ.авкО Ñ.ексÑ.а Ð.Ð.СÐ.Ð. сОЌвПла, Ма кПÑ.ПÑ.ПЌ МаÑ.ПЎОÑ.ся кÑ.Ñ.сПÑ..
+     НажаÑ.Ое заглавМПй A авÑ.ПЌаÑ.ОÑ.ескО пеÑ.еЌеÑ.аеÑ. Ð.ас Ўля ЎПбавлеМОя Ñ.ексÑ.а
+     в кПМеÑ. сÑ.Ñ.ПкО.
+
+  3. НажаÑ.Ое заглавМПй R пеÑ.евПЎОÑ. Ð.ас в Ñ.ежОЌ заЌеМÑ. ЎП Ñ.еÑ. пПÑ., пПка Ме
+     бÑ.ЎеÑ. МажаÑ.а клавОÑ.а <ESC> Ўля завеÑ.Ñ.еМОя.
+
+  4. НабÑ.ав ":set xxx" вÑ. сЌПжеÑ.е вклÑ.Ñ.ОÑ.Ñ. паÑ.аЌеÑ.Ñ. "xxx"
+
+
+
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                 УÑ.Пк 7: Ð.Ð.Ð.АНÐ.Ы Ð.Ð.Ð.УЧÐ.НÐ.Я Ð.СТРÐ.Ð.ННÐ.Ð. СÐ.РАÐ.Ð.Ð.
+
+               ** Ð.спПлÑ.зÑ.йÑ.е всÑ.Ñ.ПеММÑ.Ñ. спÑ.авПÑ.ÐœÑ.Ñ. сОсÑ.еЌÑ. **
+
+  Vim ПблаЎаеÑ. ЌПÑ.МПй всÑ.Ñ.ПеММПй спÑ.авПÑ.МПй сОсÑ.еЌПй. Ð.ля МаÑ.ала пПпÑ.ПбÑ.йÑ.е
+  ПЎОМ Оз Ñ.Ñ.еÑ. ваÑ.ОаМÑ.Пв:
+        - МажЌОÑ.е клавОÑ.Ñ. <HELP> (еслО Ñ.акПвая ОЌееÑ.ся Ма клавОаÑ.Ñ.Ñ.е)
+        - МажЌОÑ.е клавОÑ.Ñ. <F1> (еслО Ñ.акПвая ОЌееÑ.ся Ма клавОаÑ.Ñ.Ñ.е)
+        - МабеÑ.ОÑ.е   :help <ENTER>
+
+  НабеÑ.ОÑ.е   :q <ENTER>   Ñ.Ñ.ПбÑ. закÑ.Ñ.Ñ.Ñ. ПкМП спÑ.авкО.
+
+  Ð.Ñ. ЌПжеÑ.е МайÑ.О спÑ.авкÑ. Ўля лÑ.бПгП пПМяÑ.Оя ОлО кПЌаМЎÑ., пÑ.ПсÑ.П заЎав
+  сППÑ.веÑ.сÑ.вÑ.Ñ.Ñ.Ой аÑ.гÑ.ЌеМÑ. кПЌаМЎе ":help". Ð.ПпÑ.ПбÑ.йÑ.е слеЎÑ.Ñ.Ñ.ее (Ме забÑ.ÐŽÑ.Ñ.е
+  МажаÑ.Ñ. <ENTER>):
+
+  :help w
+  :help c_<T
+  :help insert-index
+
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                     УÑ.Пк 8: СÐ.Ð.Ð.АНÐ.Ð. СТАРТÐ.Ð.Ð.Ð.Ð. СÐ.Ð Ð.Ð.ТА
+
+                        ** Ð.клÑ.Ñ.ОЌ вПзЌПжМПсÑ.О Vim **
+
+  Vim ОЌееÑ. МаЌМПгП бПлÑ.Ñ.е вПзЌПжМПсÑ.ей, Ñ.еЌ Vi, ПЎМакП бПлÑ.Ñ.ОМсÑ.ваП Оз МОÑ.
+  вÑ.клÑ.Ñ.еМÑ. пП Ñ.ЌПлÑ.аМОÑ.. Ð.ля Ñ.ПгП, Ñ.Ñ.ПбÑ. МаÑ.аÑ.Ñ. ОспПлÑ.зПваÑ.Ñ. МПвÑ.е
+  вПзЌПжМПсÑ.О Ð.аЌ слеЎÑ.еÑ. сПзЎаÑ.Ñ. Ñ.айл "vimrc".
+
+  1. Ð.Ñ.Ñ.еЎакÑ.ОÑ.Ñ.йÑ.е Ñ.айл "vimrc", егП Ñ.аспПлПжеМОе завОсОÑ. ПÑ. ОспПлÑ.зÑ.еЌПй
+     сОсÑ.еЌÑ.:
+
+       :edit ~/.vimrc                   Ўля Unix
+       :edit $VIM/_vimrc                Ўля MS-Windows
+
+  2. ТепеÑ.Ñ. пÑ.ПÑ.ОÑ.айÑ.е пÑ.ОЌеÑ. Ñ.айла "vimrc":
+
+       :read $VIMRUNTIME/vimrc_example.vim
+
+  3. Ð.апОÑ.ОÑ.е Ñ.айл:
+
+       :write
+
+  ТепеÑ.Ñ. пÑ.О слеЎÑ.Ñ.Ñ.еЌ запÑ.ске Vim бÑ.ЎеÑ. вклÑ.Ñ.еМа пПЎсвеÑ.ка сОМÑ.аксОса. Ð.се
+  МасÑ.Ñ.ПйкО, пÑ.еЎпПÑ.ОÑ.аеЌÑ.е Ð.аЌО, ЌПгÑ.Ñ. бÑ.Ñ.Ñ. ЎПбавлеМÑ. в Ñ.айл "vimrc".
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  На эÑ.ПЌ завеÑ.Ñ.аеÑ.ся УÑ.ебМОк Vim. Ð.Ðœ бÑ.л пÑ.еЎМазМаÑ.еМ Ўля Ñ.ПгП, Ñ.Ñ.ПбÑ. ЎаÑ.Ñ.
+  ПбÑ.ее пÑ.еЎсÑ.авлеМОе П Ñ.еЎакÑ.ПÑ.е Vim, ЎПсÑ.аÑ.ПÑ.МПе Ўля Ñ.ПгП, Ñ.Ñ.ПбÑ. с легкПсÑ.Ñ.Ñ.
+  ОспПлÑ.зПваÑ.Ñ. егП. УÑ.ебМОк Ўалек ПÑ. пПлМПÑ.Ñ., пПскПлÑ.кÑ. Vim ОЌееÑ. ПÑ.еМÑ. ЌМПгП
+  кПЌаМЎ. Ð.Ñ.ПÑ.ОÑ.айÑ.е Ñ.епеÑ.Ñ. Ñ.Ñ.кПвПЎсÑ.вП пПлÑ.зПваÑ.еля: ":help user-manual".
+
+  Ð.ля ЎалÑ.МейÑ.егП Ñ.Ñ.еМОя Ñ.екПЌеМЎÑ.еÑ.ся кМОга:
+        Vim - Vi Improved - АвÑ.ПÑ.: Steve Oualline
+        Ð.зЎаÑ.елÑ.: New Riders
+  ЭÑ.а кМОга пПлМПсÑ.Ñ.Ñ. пПсвяÑ.еМа Vim. Ð.сПбеММП пПлезМа МПвОÑ.каЌ. СПЎеÑ.жОÑ.
+  ЌМПжесÑ.вП пÑ.ОЌеÑ.Пв О ОллÑ.сÑ.Ñ.аÑ.Ой.
+  Ð.згляМОÑ.е Ма See http://iccf-holland.org/click5.html
+
+  СлеЎÑ.Ñ.Ñ.ая кМОга бПлее пПÑ.Ñ.еММПгП вПзÑ.асÑ.а О пПсвяÑ.еМа бПлÑ.Ñ.е Vi, Ñ.еЌ Vim,
+  ПЎМакП Ñ.акже Ñ.екПЌеМЎÑ.еÑ.ся:
+        Learning the Vi Editor - АвÑ.ПÑ.: Linda Lamb
+        Ð.зЎаÑ.елÑ.: O'Reilly & Associates Inc.
+  ЭÑ.П Ñ.ПÑ.ПÑ.ая кМОга Ўля Ñ.ПгП, Ñ.Ñ.ПбÑ. Ñ.зМаÑ.Ñ. все, Ñ.Ñ.П Ñ.ПлÑ.кП ЌПжМП пÑ.ПЎелÑ.ваÑ.Ñ. с
+  Vi. КесÑ.Пе ОзЎаМОе Ñ.акже вклÑ.Ñ.аеÑ. ОМÑ.ПÑ.ЌаÑ.ОÑ. П Vim.
+
+  ЭÑ.ПÑ. Ñ.Ñ.ебМОк бÑ.л МапОсаМ Michael C. Pierce О Robert K. Ware, Colorado School
+  of Mines с ОспПлÑ.зПваМОеЌ ОЎей, пÑ.еЎлПжеММÑ.Ñ. Charles Smith, Colorado State
+  University. E-mail: bware@mines.colorado.edu.
+
+  Ð.ПÑ.абПÑ.аМП Ўля Vim Bram Moolenaar.
+
+  Ð.еÑ.евПЎ: АМЎÑ.ей Ð.Оселев <a_kissel@eudoramail.com>, 2002.
+  Translator: Andrey Kiselev <a_kissel@eudoramail.com>, 2002.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

runtime/tutor/tutor.vim

@@ -1 +1 @@
 " Vim tutor support file
 " Author: Eduardo F. Amatria <eferna1@platea.pntic.mec.es>
-" Last Change:  2006 Mar 18
+" Last Change:  2006 Sep 09
 
 " This small source file is used for detecting if a translation of the
 " tutor file exist, i.e., a tutor.xx file, where xx is the language.
@@ -93 +93 @@
   endif
 endif
 
-" The Greek tutor is available in two encodings, guess which one to use
-if s:ext =~? '\.gr' && &enc =~ 737
-  let s:ext = ".gr.cp737"
+" The Greek tutor is available in three encodings, guess what to use.
+" We used ".gr" (Greece) instead of ".el" (Greek); accept both.
+if s:ext =~? '\.gr\|\.el'
+  if &enc == "iso-8859-7"
+    let s:ext = ".gr"
+  elseif &enc == "utf-8"
+    let s:ext = ".gr.utf-8"
+  elseif &enc =~ 737
+    let s:ext = ".gr.cp737"
+  endif
 endif
 
 " The Slovak tutor is available in two encodings, guess which one to use
@@ -103 +110 @@
   let s:ext = ".sk.cp1250"
 endif
 
-" The Russian tutor is available in two encodings, guess which one to use.
-" This segment is from the above lines and modified by
-" Alexey I. Froloff <raorn@altlinux.org> for Russian vim tutorial
-if s:ext =~? '\.ru' && &enc =~ 1251
-  let s:ext = ".ru.cp1251"
+" The Russian tutor is available in three encodings, guess which one to use.
+if s:ext =~? '\.ru'
+  if &enc == 'utf-8'
+    let s:ext = '.ru.utf-8'
+  elseif &enc =~ '1251'
+    let s:ext = '.ru.cp1251'
+  elseif &enc =~ 'koi8'
+    let s:ext = '.ru'
+  endif
 endif
 
 " Somehow ".ge" (Germany) is sometimes used for ".de" (Deutsch).

src/auto/configure

@@ -4014 +4014 @@
       LDFLAGS=$ldflags_save
       if test $perl_ok = yes; then
         if test "X$perlcppflags" != "X"; then
-          PERL_CFLAGS="$perlcppflags"
+                  PERL_CFLAGS=`echo "$perlcppflags" | sed 's/-pipe //'`
         fi
         if test "X$perlldflags" != "X"; then
           LDFLAGS="$perlldflags $LDFLAGS"

src/buffer.c

@@ -434 +434 @@
     if (usingNetbeans)
         netbeans_file_closed(buf);
 #endif
-#ifdef FEAT_AUTOCHDIR
-    /* Change directories when the acd option is set on. */
-    if (p_acd && curbuf->b_ffname != NULL
-                                     && vim_chdirfile(curbuf->b_ffname) == OK)
-        shorten_fnames(TRUE);
-#endif
+    /* Change directories when the 'acd' option is set. */
+    DO_AUTOCHDIR
 
     /*
      * Remove the buffer from the list.
@@ -1390 +1386 @@
     }
     else
     {
-        need_fileinfo = TRUE;           /* display file info after redraw */
+        if (!msg_silent)
+            need_fileinfo = TRUE;       /* display file info after redraw */
         (void)buf_check_timestamp(curbuf, FALSE); /* check if file changed */
 #ifdef FEAT_AUTOCMD
         curwin->w_topline = 1;
@@ -1422 +1419 @@
         netbeans_file_activated(curbuf);
 #endif
 
-#ifdef FEAT_AUTOCHDIR
-    /* Change directories when the acd option is set on. */
-    if (p_acd && curbuf->b_ffname != NULL
-                                     && vim_chdirfile(curbuf->b_ffname) == OK)
-        shorten_fnames(TRUE);
-#endif
+    /* Change directories when the 'acd' option is set. */
+    DO_AUTOCHDIR
 
 #ifdef FEAT_KEYMAP
     if (curbuf->b_kmap_state & KEYMAP_INIT)
@@ -1436 +1429 @@
     redraw_later(NOT_VALID);
 }
 
+#if defined(FEAT_AUTOCHDIR) || defined(PROTO)
+/*
+ * Change to the directory of the current buffer.
+ */
+    void
+do_autochdir()
+{
+    if (curbuf->b_ffname != NULL && vim_chdirfile(curbuf->b_ffname) == OK)
+        shorten_fnames(TRUE);
+}
+#endif
+
 /*
  * functions for dealing with the buffer list
  */
@@ -3324 +3329 @@
     {
         usefmt = eval_to_string_safe(fmt + 2, NULL, use_sandbox);
         if (usefmt == NULL)
-            usefmt = (char_u *)"";
+            usefmt = fmt;
     }
 #endif
 
@@ -5420 +5425 @@
     buf_T       *newbuf;
     int         differ = TRUE;
     linenr_T    lnum;
-#ifdef FEAT_AUTOCMD
     aco_save_T  aco;
-#else
-    buf_T       *old_curbuf = curbuf;
-#endif
     exarg_T     ea;
 
     /* Allocate a buffer without putting it in the buffer list. */
@@ -5439 +5440 @@
         return TRUE;
     }
 
-#ifdef FEAT_AUTOCMD
     /* set curwin/curbuf to buf and save a few things */
     aucmd_prepbuf(&aco, newbuf);
-#else
-    curbuf = newbuf;
-    curwin->w_buffer = newbuf;
-#endif
 
     if (ml_open(curbuf) == OK
             && readfile(buf->b_ffname, buf->b_fname,
@@ -5466 +5462 @@
     }
     vim_free(ea.cmd);
 
-#ifdef FEAT_AUTOCMD
     /* restore curwin/curbuf and a few other things */
     aucmd_restbuf(&aco);
-#else
-    curbuf = old_curbuf;
-    curwin->w_buffer = old_curbuf;
-#endif
 
     if (curbuf != newbuf)       /* safety check */
         wipe_buffer(newbuf, FALSE);

src/configure

@@ -2 +2 @@
 # run the automatically generated configure script
 CONFIG_STATUS=auto/config.status \
         auto/configure "$@" --srcdir="${srcdir:-.}" --cache-file=auto/config.cache
+result=$?
+
 # Stupid autoconf 2.5x causes this file to be left behind.
 if test -f configure.lineno; then rm -f configure.lineno; fi
+
+exit $result

src/configure.in

@@ -508 +508 @@
       LDFLAGS=$ldflags_save
       if test $perl_ok = yes; then
         if test "X$perlcppflags" != "X"; then
-          PERL_CFLAGS="$perlcppflags"
+          dnl remove -pipe, it confuses cproto
+          PERL_CFLAGS=`echo "$perlcppflags" | sed 's/-pipe //'`
         fi
         if test "X$perlldflags" != "X"; then
           LDFLAGS="$perlldflags $LDFLAGS"

src/edit.c

@@ -129 +129 @@
 
 static void ins_ctrl_x __ARGS((void));
 static int  has_compl_option __ARGS((int dict_opt));
-static int ins_compl_add __ARGS((char_u *str, int len, int icase, char_u *fname, char_u **cptext, int cdir, int flags, int dup));
+static int ins_compl_add __ARGS((char_u *str, int len, int icase, char_u *fname, char_u **cptext, int cdir, int flags, int adup));
 static int  ins_compl_equal __ARGS((compl_T *match, char_u *str, int len));
 static void ins_compl_longest_match __ARGS((compl_T *match));
 static void ins_compl_add_matches __ARGS((int num_matches, char_u **matches, int icase));
@@ -719 +719 @@
 #ifdef FEAT_INS_EXPAND
         /*
          * Special handling of keys while the popup menu is visible or wanted
-         * and the cursor is still in the completed word.
+         * and the cursor is still in the completed word.  Only when there is
+         * a match, skip this when no matches were found.
          */
-        if (compl_started && pum_wanted() && curwin->w_cursor.col >= compl_col)
+        if (compl_started
+                && pum_wanted()
+                && curwin->w_cursor.col >= compl_col
+                && (compl_shown_match == NULL
+                    || compl_shown_match != compl_shown_match->cp_next))
         {
             /* BS: Delete one character from "compl_leader". */
             if ((c == K_BS || c == Ctrl_H)
@@ -751 +756 @@
                     continue;
                 }
 
-                /* Pressing CTRL-Y selects the current match.  Shen
+                /* Pressing CTRL-Y selects the current match.  When
                  * compl_enter_selects is set the Enter key does the same. */
                 if (c == Ctrl_Y || (compl_enter_selects
                                    && (c == CAR || c == K_KENTER || c == NL)))
@@ -877 +882 @@
                 /* Close the cmdline window. */
                 cmdwin_result = K_IGNORE;
                 got_int = FALSE; /* don't stop executing autocommands et al. */
+                nomove = TRUE;
                 goto doESCkey;
             }
 #endif
@@ -2112 +2118 @@
  * maybe because alloc() returns NULL, then FAIL is returned.
  */
     static int
-ins_compl_add(str, len, icase, fname, cptext, cdir, flags, dup)
+ins_compl_add(str, len, icase, fname, cptext, cdir, flags, adup)
     char_u      *str;
     int         len;
     int         icase;
@@ -2120 +2126 @@
     char_u      **cptext;   /* extra text for popup menu or NULL */
     int         cdir;
     int         flags;
-    int         dup;        /* accept duplicate match */
+    int         adup;       /* accept duplicate match */
 {
     compl_T     *match;
     int         dir = (cdir == 0 ? compl_direction : cdir);
@@ -2134 +2140 @@
     /*
      * If the same match is already present, don't add it.
      */
-    if (compl_first_match != NULL && !dup)
+    if (compl_first_match != NULL && !adup)
     {
         match = compl_first_match;
         do
@@ -2399 +2405 @@
     /* compl_pattern doesn't need to be set */
     compl_orig_text = vim_strnsave(ml_get_curline() + compl_col, compl_length);
     if (compl_orig_text == NULL || ins_compl_add(compl_orig_text,
-                        -1, FALSE, NULL, NULL, 0, ORIGINAL_TEXT, FALSE) != OK)
+                        -1, p_ic, NULL, NULL, 0, ORIGINAL_TEXT, FALSE) != OK)
         return;
 
     /* Handle like dictionary completion. */
@@ -2409 +2415 @@
     compl_matches = ins_compl_make_cyclic();
     compl_started = TRUE;
     compl_used_match = TRUE;
+    compl_cont_status = 0;
 
     compl_curr_match = compl_first_match;
     ins_complete(Ctrl_N);
@@ -2753 +2760 @@
         }
         else
 # endif
+            if (count > 0)      /* avoid warning for using "files" uninit */
         {
             ins_compl_files(count, files, thesaurus, flags,
                                                         &regmatch, buf, &dir);
@@ -2813 +2821 @@
                         ptr = find_word_end(ptr);
                     add_r = ins_compl_add_infercase(regmatch->startp[0],
                                           (int)(ptr - regmatch->startp[0]),
-                                                     FALSE, files[i], *dir, 0);
+                                                     p_ic, files[i], *dir, 0);
                     if (thesaurus)
                     {
                         char_u *wstart;
@@ -2849 +2857 @@
                                 ptr = find_word_end(ptr);
                             add_r = ins_compl_add_infercase(wstart,
                                     (int)(ptr - wstart),
-                                    FALSE, files[i], *dir, 0);
+                                    p_ic, files[i], *dir, 0);
                         }
                     }
                     if (add_r == OK)
@@ -3015 +3023 @@
     if ((int)(p - line) - (int)compl_col <= 0)
         return K_BS;
 
-    /* For redo we need to repeat this backspace. */
-    AppendCharToRedobuff(K_BS);
-
     /* Deleted more than what was used to find matches or didn't finish
      * finding all matches: need to look for matches all over again. */
     if (curwin->w_cursor.col <= compl_col + compl_length
@@ -3046 +3051 @@
     ins_compl_delete();
     ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
     compl_used_match = FALSE;
-    compl_enter_selects = FALSE;
 
     if (compl_started)
         ins_compl_set_original_text(compl_leader);
@@ -3076 +3080 @@
         compl_restarting = FALSE;
     }
 
+#if 0   /* disabled, made CTRL-L, BS and typing char jump to original text. */
     if (!compl_used_match)
     {
         /* Go to the original text, since none of the matches is inserted. */
@@ -3087 +3092 @@
         compl_curr_match = compl_shown_match;
         compl_shows_dir = compl_direction;
     }
+#endif
+    compl_enter_selects = !compl_used_match;
 
     /* Show the popup menu with a different set of matches. */
     ins_compl_show_pum();
+
+    /* Don't let Enter select the original text when there is no popup menu. */
+    if (compl_match_array == NULL)
+        compl_enter_selects = FALSE;
 }
 
 /*
@@ -3115 +3126 @@
 #endif
         ins_char(c);
 
-    /* For redo we need to count this character so that the number of
-     * backspaces is correct. */
-    AppendCharToRedobuff(c);
-
     /* If we didn't complete finding matches we must search again. */
     if (compl_was_interrupted)
         ins_compl_restart();
@@ -3175 +3182 @@
     char_u      *p;
     int         len = curwin->w_cursor.col - compl_col;
     int         c;
+    compl_T     *cp;
 
     p = compl_shown_match->cp_str;
     if ((int)STRLEN(p) <= len)   /* the match is too short */
-        return;
+    {
+        /* When still at the original match use the first entry that matches
+         * the leader. */
+        if (compl_shown_match->cp_flags & ORIGINAL_TEXT)
+        {
+            p = NULL;
+            for (cp = compl_shown_match->cp_next; cp != NULL
+                                 && cp != compl_first_match; cp = cp->cp_next)
+            {
+                if (ins_compl_equal(cp, compl_leader,
+                                                   (int)STRLEN(compl_leader)))
+                {
+                    p = cp->cp_str;
+                    break;
+                }
+            }
+            if (p == NULL || (int)STRLEN(p) <= len)
+                return;
+        }
+        else
+            return;
+    }
     p += len;
 #ifdef FEAT_MBYTE
     c = mb_ptr2char(p);
@@ -3198 +3227 @@
     int     c;
 {
     char_u      *ptr;
-    int         temp;
     int         want_cindent;
     int         retval = FALSE;
 
@@ -3354 +3382 @@
             if (compl_curr_match != NULL || compl_leader != NULL || c == Ctrl_E)
             {
                 char_u  *p;
+                int     temp = 0;
 
                 /*
                  * If any of the original typed text has been changed, eg when
@@ -3369 +3398 @@
                     ptr = compl_leader;
                 else
                     ptr = compl_orig_text;
-                p = compl_orig_text;
-                for (temp = 0; p[temp] != NUL && p[temp] == ptr[temp]; ++temp)
-                    ;
+                if (compl_orig_text != NULL)
+                {
+                    p = compl_orig_text;
+                    for (temp = 0; p[temp] != NUL && p[temp] == ptr[temp];
+                                                                       ++temp)
+                        ;
 #ifdef FEAT_MBYTE
-                if (temp > 0)
-                    temp -= (*mb_head_off)(compl_orig_text, p + temp);
+                    if (temp > 0)
+                        temp -= (*mb_head_off)(compl_orig_text, p + temp);
 #endif
-                for (p += temp; *p != NUL; mb_ptr_adv(p))
-                    AppendCharToRedobuff(K_BS);
-                AppendToRedobuffLit(ptr + temp, -1);
+                    for (p += temp; *p != NUL; mb_ptr_adv(p))
+                        AppendCharToRedobuff(K_BS);
+                }
+                if (ptr != NULL)
+                    AppendToRedobuffLit(ptr + temp, -1);
             }
 
 #ifdef FEAT_CINDENT
@@ -3578 +3612 @@
 {
     char_u      *word;
     int         icase = FALSE;
-    int         dup = FALSE;
+    int         adup = FALSE;
     char_u      *(cptext[CPT_COUNT]);
 
     if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL)
@@ -3595 +3629 @@
         if (get_dict_string(tv->vval.v_dict, (char_u *)"icase", FALSE) != NULL)
             icase = get_dict_number(tv->vval.v_dict, (char_u *)"icase");
         if (get_dict_string(tv->vval.v_dict, (char_u *)"dup", FALSE) != NULL)
-            dup = get_dict_number(tv->vval.v_dict, (char_u *)"dup");
+            adup = get_dict_number(tv->vval.v_dict, (char_u *)"dup");
     }
     else
     {
@@ -3604 +3638 @@
     }
     if (word == NULL || *word == NUL)
         return FAIL;
-    return ins_compl_add(word, -1, icase, NULL, cptext, dir, 0, dup);
+    return ins_compl_add(word, -1, icase, NULL, cptext, dir, 0, adup);
 }
 #endif
 
@@ -3796 +3830 @@
                     TAG_INS_COMP | (ctrl_x_mode ? TAG_VERBOSE : 0),
                     TAG_MANY, curbuf->b_ffname) == OK && num_matches > 0)
             {
-                ins_compl_add_matches(num_matches, matches, FALSE);
+                ins_compl_add_matches(num_matches, matches, p_ic);
             }
             p_ic = save_p_ic;
             break;
@@ -3837 +3871 @@
             num_matches = expand_spelling(first_match_pos.lnum,
                                  first_match_pos.col, compl_pattern, &matches);
             if (num_matches > 0)
-                ins_compl_add_matches(num_matches, matches, FALSE);
+                ins_compl_add_matches(num_matches, matches, p_ic);
 #endif
             break;
 
@@ -3971 +4005 @@
                             continue;
                     }
                 }
-                if (ins_compl_add_infercase(ptr, len, FALSE,
+                if (ins_compl_add_infercase(ptr, len, p_ic,
                                  ins_buf == curbuf ? NULL : ins_buf->b_sfname,
                                            0, flags) != NOTDONE)
                 {
@@ -4100 +4134 @@
                 && compl_shown_match->cp_next != NULL
                 && compl_shown_match->cp_next != compl_first_match)
             compl_shown_match = compl_shown_match->cp_next;
+
+        /* If we didn't find it searching forward, and compl_shows_dir is
+         * backward, find the last match. */
+        if (compl_shows_dir == BACKWARD
+                && !ins_compl_equal(compl_shown_match,
+                                      compl_leader, (int)STRLEN(compl_leader))
+                && (compl_shown_match->cp_next == NULL
+                    || compl_shown_match->cp_next == compl_first_match))
+        {
+            while (!ins_compl_equal(compl_shown_match,
+                                      compl_leader, (int)STRLEN(compl_leader))
+                    && compl_shown_match->cp_prev != NULL
+                    && compl_shown_match->cp_prev != compl_first_match)
+                compl_shown_match = compl_shown_match->cp_prev;
+        }
     }
 
     if (allow_get_expansion && insert_match
@@ -4124 +4173 @@
     {
         if (compl_shows_dir == FORWARD && compl_shown_match->cp_next != NULL)
         {
-            if (compl_pending != 0)
-                --compl_pending;
             compl_shown_match = compl_shown_match->cp_next;
             found_end = (compl_first_match != NULL
                            && (compl_shown_match->cp_next == compl_first_match
@@ -4134 +4181 @@
         else if (compl_shows_dir == BACKWARD
                                         && compl_shown_match->cp_prev != NULL)
         {
-            if (compl_pending != 0)
-                ++compl_pending;
             found_end = (compl_shown_match == compl_first_match);
             compl_shown_match = compl_shown_match->cp_prev;
             found_end |= (compl_shown_match == compl_first_match);
         }
         else
         {
+            if (!allow_get_expansion)
+            {
+                if (advance)
+                {
+                    if (compl_shows_dir == BACKWARD)
+                        compl_pending -= todo + 1;
+                    else
+                        compl_pending += todo + 1;
+                }
+                return -1;
+            }
+
             if (advance)
             {
                 if (compl_shows_dir == BACKWARD)
@@ -4149 +4206 @@
                 else
                     ++compl_pending;
             }
-            if (!allow_get_expansion)
-                return -1;
 
             /* Find matches. */
             num_matches = ins_compl_get_exp(&compl_startpos);
-            if (compl_pending != 0 && compl_direction == compl_shows_dir
+
+            /* handle any pending completions */
+            while (compl_pending != 0 && compl_direction == compl_shows_dir
                                                                    && advance)
-                compl_shown_match = compl_curr_match;
+            {
+                if (compl_pending > 0 && compl_shown_match->cp_next != NULL)
+                {
+                    compl_shown_match = compl_shown_match->cp_next;
+                    --compl_pending;
+                }
+                if (compl_pending < 0 && compl_shown_match->cp_prev != NULL)
+                {
+                    compl_shown_match = compl_shown_match->cp_prev;
+                    ++compl_pending;
+                }
+                else
+                    break;
+            }
             found_end = FALSE;
         }
         if ((compl_shown_match->cp_flags & ORIGINAL_TEXT) == 0
@@ -4265 +4335 @@
         return;
     count = 0;
 
-    ++no_mapping;
+    /* Check for a typed key.  Do use mappings, otherwise vim_is_ctrl_x_key()
+     * can't do its work correctly. */
     c = vpeekc_any();
-    --no_mapping;
     if (c != NUL)
     {
         if (vim_is_ctrl_x_key(c) && c != Ctrl_X && c != Ctrl_R)
@@ -4277 +4347 @@
             (void)ins_compl_next(FALSE, ins_compl_key2count(c),
                                                     c != K_UP && c != K_DOWN);
         }
-        else if (c != Ctrl_R)
-            compl_interrupted = TRUE;
+        else
+        {
+            /* Need to get the character to have KeyTyped set.  We'll put it
+             * back with vungetc() below. */
+            c = safe_vgetc();
+
+            /* Don't interrupt completion when the character wasn't typed,
+             * e.g., when doing @q to replay keys. */
+            if (c != Ctrl_R && KeyTyped)
+                compl_interrupted = TRUE;
+
+            vungetc(c);
+        }
     }
     if (compl_pending != 0 && !got_int)
-        (void)ins_compl_next(FALSE, compl_pending > 0
-                                      ? compl_pending : -compl_pending, TRUE);
+    {
+        int todo = compl_pending > 0 ? compl_pending : -compl_pending;
+
+        compl_pending = 0;
+        (void)ins_compl_next(FALSE, todo, TRUE);
+    }
 }
 
 /*
@@ -4611 +4696 @@
                                      (int)STRLEN(compl_pattern), curs_col);
             if (compl_xp.xp_context == EXPAND_UNSUCCESSFUL
                     || compl_xp.xp_context == EXPAND_NOTHING)
-                return FAIL;
-            startcol = (int)(compl_xp.xp_pattern - compl_pattern);
-            compl_col = startcol;
-            compl_length = curs_col - startcol;
+                /* No completion possible, use an empty pattern to get a
+                 * "pattern not found" message. */
+                compl_col = curs_col;
+            else
+                compl_col = (int)(compl_xp.xp_pattern - compl_pattern);
+            compl_length = curs_col - compl_col;
         }
         else if (ctrl_x_mode == CTRL_X_FUNCTION || ctrl_x_mode == CTRL_X_OMNI)
         {
@@ -4668 +4755 @@
             else
                 compl_col = spell_word_start(startcol);
             if (compl_col >= (colnr_T)startcol)
-                return FAIL;
-            spell_expand_check_cap(compl_col);
+            {
+                compl_length = 0;
+                compl_col = curs_col;
+            }
+            else
+            {
+                spell_expand_check_cap(compl_col);
+                compl_length = (int)curs_col - compl_col;
+            }
             /* Need to obtain "line" again, it may have become invalid. */
             line = ml_get(curwin->w_cursor.lnum);
-            compl_length = (int)curs_col - compl_col;
             compl_pattern = vim_strnsave(line + compl_col, compl_length);
             if (compl_pattern == NULL)
 #endif
@@ -4720 +4813 @@
         vim_free(compl_orig_text);
         compl_orig_text = vim_strnsave(line + compl_col, compl_length);
         if (compl_orig_text == NULL || ins_compl_add(compl_orig_text,
-                        -1, FALSE, NULL, NULL, 0, ORIGINAL_TEXT, FALSE) != OK)
+                        -1, p_ic, NULL, NULL, 0, ORIGINAL_TEXT, FALSE) != OK)
         {
             vim_free(compl_pattern);
             compl_pattern = NULL;
@@ -8508 +8601 @@
     tpos = curwin->w_cursor;
     if (oneleft() == OK)
     {
-        start_arrow(&tpos);
+#if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
+        /* Only call start_arrow() when not busy with preediting, it will
+         * break undo.  K_LEFT is inserted in im_correct_cursor(). */
+        if (!im_is_preediting())
+#endif
+            start_arrow(&tpos);
 #ifdef FEAT_RIGHTLEFT
         /* If exit reversed string, position is fixed */
         if (revins_scol != -1 && (int)curwin->w_cursor.col >= revins_scol)

src/eval.c

@@ -454 +454 @@
 static char_u *deref_func_name __ARGS((char_u *name, int *lenp));
 static int get_func_tv __ARGS((char_u *name, int len, typval_T *rettv, char_u **arg, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, dict_T *selfdict));
 static int call_func __ARGS((char_u *name, int len, typval_T *rettv, int argcount, typval_T *argvars, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, dict_T *selfdict));
-static void emsg_funcname __ARGS((char *msg, char_u *name));
+static void emsg_funcname __ARGS((char *ermsg, char_u *name));
 
 static void f_add __ARGS((typval_T *argvars, typval_T *rettv));
 static void f_append __ARGS((typval_T *argvars, typval_T *rettv));
@@ -701 +701 @@
 static void list_one_var_a __ARGS((char_u *prefix, char_u *name, int type, char_u *string));
 static void set_var __ARGS((char_u *name, typval_T *varp, int copy));
 static int var_check_ro __ARGS((int flags, char_u *name));
+static int var_check_fixed __ARGS((int flags, char_u *name));
 static int tv_check_lock __ARGS((int lock, char_u *name));
 static void copy_tv __ARGS((typval_T *from, typval_T *to));
 static int item_copy __ARGS((typval_T *from, typval_T *to, int deep, int copyID));
@@ -2260 +2261 @@
             EMSG(_(e_letunexp));
         else
         {
-            char_u      *tofree = NULL;
+            char_u      *ptofree = NULL;
             char_u      *s;
 
             p = get_tv_string_chk(tv);
@@ -2269 +2270 @@
                 s = get_reg_contents(*arg == '@' ? '"' : *arg, TRUE, TRUE);
                 if (s != NULL)
                 {
-                    p = tofree = concat_str(s, p);
+                    p = ptofree = concat_str(s, p);
                     vim_free(s);
                 }
             }
@@ -2278 +2279 @@
                 write_reg_contents(*arg == '@' ? '"' : *arg, p, -1, FALSE);
                 arg_end = arg + 1;
             }
-            vim_free(tofree);
+            vim_free(ptofree);
         }
     }
 
@@ -3364 +3365 @@
         hi = hash_find(ht, varname);
         if (!HASHITEM_EMPTY(hi))
         {
+            if (var_check_fixed(HI2DI(hi)->di_flags, name))
+                return FAIL;
             if (var_check_ro(HI2DI(hi)->di_flags, name))
                 return FAIL;
             delete_var(ht, hi);
@@ -6059 +6062 @@
     tabpage_T   *tp;
 #endif
 
+    /* Only do this once. */
+    want_garbage_collect = FALSE;
+    may_garbage_collect = FALSE;
+
     /*
      * 1. Go through all accessible variables and mark all lists and dicts
      *    with copyID.
@@ -7595 +7602 @@
  * Give an error message with a function name.  Handle <SNR> things.
  */
     static void
-emsg_funcname(msg, name)
-    char        *msg;
+emsg_funcname(ermsg, name)
+    char        *ermsg;
     char_u      *name;
 {
     char_u      *p;
@@ -7605 +7612 @@
         p = concat_str((char_u *)"<SNR>", name + 3);
     else
         p = name;
-    EMSG2(_(msg), p);
+    EMSG2(_(ermsg), p);
     if (p != name)
         vim_free(p);
 }
@@ -8252 +8259 @@
         EMSG(_("E785: complete() can only be used in Insert mode"));
         return;
     }
+
+    /* Check for undo allowed here, because if something was already inserted
+     * the line was already saved for undo and this check isn't done. */
+    if (!undo_allowed())
+        return;
+
     if (argvars[1].v_type != VAR_LIST || argvars[1].vval.v_list == NULL)
     {
         EMSG(_(e_invarg));
@@ -9173 +9186 @@
     typval_T    save_key;
     int         rem;
     int         todo;
-    char_u      *msg = map ? (char_u *)"map()" : (char_u *)"filter()";
+    char_u      *ermsg = map ? (char_u *)"map()" : (char_u *)"filter()";
     int         save_did_emsg;
 
     rettv->vval.v_number = 0;
     if (argvars[0].v_type == VAR_LIST)
     {
         if ((l = argvars[0].vval.v_list) == NULL
-                || (map && tv_check_lock(l->lv_lock, msg)))
+                || (map && tv_check_lock(l->lv_lock, ermsg)))
             return;
     }
     else if (argvars[0].v_type == VAR_DICT)
     {
         if ((d = argvars[0].vval.v_dict) == NULL
-                || (map && tv_check_lock(d->dv_lock, msg)))
+                || (map && tv_check_lock(d->dv_lock, ermsg)))
             return;
     }
     else
     {
-        EMSG2(_(e_listdictarg), msg);
+        EMSG2(_(e_listdictarg), ermsg);
         return;
     }
 
@@ -9223 +9236 @@
                 {
                     --todo;
                     di = HI2DI(hi);
-                    if (tv_check_lock(di->di_tv.v_lock, msg))
+                    if (tv_check_lock(di->di_tv.v_lock, ermsg))
                         break;
                     vimvars[VV_KEY].vv_str = vim_strsave(di->di_key);
                     if (filter_map_one(&di->di_tv, expr, map, &rem) == FAIL
@@ -9242 +9255 @@
         {
             for (li = l->lv_first; li != NULL; li = nli)
             {
-                if (tv_check_lock(li->li_tv.v_lock, msg))
+                if (tv_check_lock(li->li_tv.v_lock, ermsg))
                     break;
                 nli = li->li_next;
                 if (filter_map_one(&li->li_tv, expr, map, &rem) == FAIL
@@ -9598 +9611 @@
     typval_T    *argvars;
     typval_T    *rettv;
 {
-    garbage_collect();
+    /* This is postponed until we are back at the toplevel, because we may be
+     * using Lists and Dicts internally.  E.g.: ":echo [garbagecollect()]". */
+    want_garbage_collect = TRUE;
 }
 
 /*
@@ -9792 +9807 @@
     varnumber_T         n;
     int                 error = FALSE;
 
+    /* Position the cursor.  Needed after a message that ends in a space. */
+    windgoto(msg_row, msg_col);
+
     ++no_mapping;
     ++allow_keys;
     if (argvars[0].v_type == VAR_UNKNOWN)
@@ -11312 +11330 @@
 
 static int inputsecret_flag = 0;
 
+static void get_user_input __ARGS((typval_T *argvars, typval_T *rettv, int inputdialog));
+
 /*
- * "input()" function
- *     Also handles inputsecret() when inputsecret is set.
+ * This function is used by f_input() and f_inputdialog() functions. The third
+ * argument to f_input() specifies the type of completion to use at the
+ * prompt. The third argument to f_inputdialog() specifies the value to return
+ * when the user cancels the prompt.
  */
     static void
-f_input(argvars, rettv)
+get_user_input(argvars, rettv, inputdialog)
     typval_T    *argvars;
     typval_T    *rettv;
+    int         inputdialog;
 {
     char_u      *prompt = get_tv_string_chk(&argvars[0]);
     char_u      *p = NULL;
@@ -11369 +11392 @@
             if (defstr != NULL)
                 stuffReadbuffSpec(defstr);
 
-            if (argvars[2].v_type != VAR_UNKNOWN)
+            if (!inputdialog && argvars[2].v_type != VAR_UNKNOWN)
             {
                 char_u  *xp_name;
-                int             xp_namelen;
+                int     xp_namelen;
                 long    argt;
 
                 rettv->vval.v_string = NULL;
@@ -11404 +11427 @@
 }
 
 /*
+ * "input()" function
+ *     Also handles inputsecret() when inputsecret is set.
+ */
+    static void
+f_input(argvars, rettv)
+    typval_T    *argvars;
+    typval_T    *rettv;
+{
+    get_user_input(argvars, rettv, FALSE);
+}
+
+/*
  * "inputdialog()" function
  */
     static void
@@ -11443 +11478 @@
     }
     else
 #endif
-        f_input(argvars, rettv);
+        get_user_input(argvars, rettv, TRUE);
 }
 
 /*
@@ -11471 +11506 @@
     }
 
     msg_start();
+    msg_row = Rows - 1; /* for when 'cmdheight' > 1 */
     lines_left = Rows;  /* avoid more prompt */
     msg_scroll = TRUE;
     msg_clr_eos();
@@ -13250 +13286 @@
         if (argvars[2].v_type != VAR_UNKNOWN)
             EMSG2(_(e_toomanyarg), "remove()");
         else if ((d = argvars[0].vval.v_dict) != NULL
-                && !tv_check_lock(d->dv_lock, (char_u *)"remove()"))
+                && !tv_check_lock(d->dv_lock, (char_u *)"remove() argument"))
         {
             key = get_tv_string_chk(&argvars[1]);
             if (key != NULL)
@@ -13270 +13306 @@
     else if (argvars[0].v_type != VAR_LIST)
         EMSG2(_(e_listdictarg), "remove()");
     else if ((l = argvars[0].vval.v_list) != NULL
-            && !tv_check_lock(l->lv_lock, (char_u *)"remove()"))
+            && !tv_check_lock(l->lv_lock, (char_u *)"remove() argument"))
     {
         int         error = FALSE;
 
@@ -14157 +14193 @@
     typval_T    *rettv;
 {
     buf_T       *buf;
-#ifdef FEAT_AUTOCMD
     aco_save_T  aco;
-#else
-    buf_T       *save_curbuf;
-#endif
     char_u      *varname, *bufvarname;
     typval_T    *varp;
     char_u      nbuf[NUMBUFLEN];
@@ -14178 +14210 @@
     if (buf != NULL && varname != NULL && varp != NULL)
     {
         /* set curbuf to be our buf, temporarily */
-#ifdef FEAT_AUTOCMD
         aucmd_prepbuf(&aco, buf);
-#else
-        save_curbuf = curbuf;
-        curbuf = buf;
-#endif
 
         if (*varname == '&')
         {
@@ -14210 +14237 @@
         }
 
         /* reset notion of buffer */
-#ifdef FEAT_AUTOCMD
         aucmd_restbuf(&aco);
-#else
-        curbuf = save_curbuf;
-#endif
     }
 }
 
@@ -16173 +16196 @@
         curwin->w_curswant = get_dict_number(dict, (char_u *)"curswant");
         curwin->w_set_curswant = FALSE;
 
-        curwin->w_topline = get_dict_number(dict, (char_u *)"topline");
+        set_topline(curwin, get_dict_number(dict, (char_u *)"topline"));
 #ifdef FEAT_DIFF
         curwin->w_topfill = get_dict_number(dict, (char_u *)"topfill");
 #endif
@@ -16218 +16241 @@
 #ifdef FEAT_VIRTUALEDIT
     dict_add_nr_str(dict, "coladd", (long)curwin->w_cursor.coladd, NULL);
 #endif
+    update_curswant();
     dict_add_nr_str(dict, "curswant", (long)curwin->w_curswant, NULL);
 
     dict_add_nr_str(dict, "topline", (long)curwin->w_topline, NULL);
@@ -16438 +16462 @@
     long        i = 0;
     long        n;
 
-    /* List must be: [fnum, lnum, col, coladd] */
-    if (arg->v_type != VAR_LIST || l == NULL
-                                      || l->lv_len != (fnump == NULL ? 3 : 4))
+    /* List must be: [fnum, lnum, col, coladd], where "fnum" is only there
+     * when "fnump" isn't NULL and "coladd" is optional. */
+    if (arg->v_type != VAR_LIST
+            || l == NULL
+            || l->lv_len < (fnump == NULL ? 2 : 3)
+            || l->lv_len > (fnump == NULL ? 3 : 4))
         return FAIL;
 
     if (fnump != NULL)
@@ -16466 +16493 @@
 #ifdef FEAT_VIRTUALEDIT
     n = list_find_nr(l, i, NULL);
     if (n < 0)
-        return FAIL;
-    posp->coladd = n;
+        posp->coladd = 0;
+    else
+        posp->coladd = n;
 #endif
 
     return OK;
@@ -17759 +17787 @@
     }
     else                    /* add a new variable */
     {
+        /* Can't add "v:" variable. */
+        if (ht == &vimvarht)
+        {
+            EMSG2(_(e_illvar), name);
+            return;
+        }
+
         /* Make sure the variable name is valid. */
         for (p = varname; *p != NUL; ++p)
             if (!eval_isnamec1(*p) && (p == varname || !VIM_ISDIGIT(*p))
@@ -17792 +17827 @@
 }
 
 /*
- * Return TRUE if di_flags "flags" indicate read-only variable "name".
+ * Return TRUE if di_flags "flags" indicates variable "name" is read-only.
  * Also give an error message.
  */
     static int
@@ -17814 +17849 @@
 }
 
 /*
+ * Return TRUE if di_flags "flags" indicates variable "name" is fixed.
+ * Also give an error message.
+ */
+    static int
+var_check_fixed(flags, name)
+    int         flags;
+    char_u      *name;
+{
+    if (flags & DI_FLAGS_FIX)
+    {
+        EMSG2(_("E795: Cannot delete variable %s"), name);
+        return TRUE;
+    }
+    return FALSE;
+}
+
+/*
  * Return TRUE if typeval "tv" is set to be locked (immutable).
  * Also give an error message, using "name".
  */
@@ -18786 +18838 @@
                 if (dict_add(fudi.fd_dict, fudi.fd_di) == FAIL)
                 {
                     vim_free(fudi.fd_di);
+                    vim_free(fp);
                     goto erret;
                 }
             }
@@ -18963 +19016 @@
     else if (lead > 0)
     {
         lead = 3;
-        if (eval_fname_sid(lv.ll_exp_name != NULL ? lv.ll_exp_name : *pp))
+        if ((lv.ll_exp_name != NULL && eval_fname_sid(lv.ll_exp_name))
+                                                       || eval_fname_sid(*pp))
         {
             /* It's "s:" or "<SID>" */
             if (current_SID <= 0)
@@ -19685 +19739 @@
     v->di_tv.vval.v_list = &fc.l_varlist;
     vim_memset(&fc.l_varlist, 0, sizeof(list_T));
     fc.l_varlist.lv_refcount = 99999;
+    fc.l_varlist.lv_lock = VAR_FIXED;
 
     /*
      * Set a:firstline to "firstline" and a:lastline to "lastline".
@@ -19761 +19816 @@
             if (p_verbose >= 14)
             {
                 char_u  buf[MSG_BUF_LEN];
-                char_u  numbuf[NUMBUFLEN];
+                char_u  numbuf2[NUMBUFLEN];
                 char_u  *tofree;
 
                 msg_puts((char_u *)"(");
@@ -19773 +19828 @@
                         msg_outnum((long)argvars[i].vval.v_number);
                     else
                     {
-                        trunc_string(tv2string(&argvars[i], &tofree, numbuf, 0),
-                                                            buf, MSG_BUF_CLEN);
+                        trunc_string(tv2string(&argvars[i], &tofree,
+                                              numbuf2, 0), buf, MSG_BUF_CLEN);
                         msg_puts(buf);
                         vim_free(tofree);
                     }
@@ -19852 +19907 @@
         else
         {
             char_u      buf[MSG_BUF_LEN];
-            char_u      numbuf[NUMBUFLEN];
+            char_u      numbuf2[NUMBUFLEN];
             char_u      *tofree;
 
             /* The value may be very long.  Skip the middle part, so that we
              * have some idea how it starts and ends. smsg() would always
              * truncate it at the end. */
-            trunc_string(tv2string(fc.rettv, &tofree, numbuf, 0),
+            trunc_string(tv2string(fc.rettv, &tofree, numbuf2, 0),
                                                            buf, MSG_BUF_CLEN);
             smsg((char_u *)_("%s returning %s"), sourcing_name, buf);
             vim_free(tofree);

src/ex_cmds2.c

@@ -3648 +3648 @@
  * Return FALSE when not sourcing a file.
  */
     int
-source_finished(getline, cookie)
-    char_u      *(*getline) __ARGS((int, void *, int));
+source_finished(fgetline, cookie)
+    char_u      *(*fgetline) __ARGS((int, void *, int));
     void        *cookie;
 {
-    return (getline_equal(getline, cookie, getsourceline)
+    return (getline_equal(fgetline, cookie, getsourceline)
             && ((struct source_cookie *)getline_cookie(
-                                                 getline, cookie))->finished);
+                                                fgetline, cookie))->finished);
 }
 #endif
 

src/ex_cmds.c

@@ -95 +95 @@
                 _("<%s>%s%s  %d,  Hex %02x,  Octal %03o"),
                                            transchar(c), buf1, buf2, c, c, c);
 #ifdef FEAT_MBYTE
-        c = cc[ci++];
+        if (enc_utf8)
+            c = cc[ci++];
+        else
+            c = 0;
 #endif
     }
 
@@ -108 +111 @@
         if (len > 0)
             IObuff[len++] = ' ';
         IObuff[len++] = '<';
-        if (utf_iscomposing(c)
+        if (enc_utf8 && utf_iscomposing(c)
 # ifdef USE_GUI
                 && !gui.in_use
 # endif
@@ -120 +123 @@
                                     : _("> %d, Hex %08x, Octal %o"), c, c, c);
         if (ci == MAX_MCO)
             break;
-        c = cc[ci++];
+        if (enc_utf8)
+            c = cc[ci++];
+        else
+            c = 0;
     }
 #endif
 
@@ -185 +191 @@
             new_indent = indent;
         else
         {
+            has_tab = FALSE;    /* avoid uninit warnings */
             len = linelen(eap->cmdidx == CMD_right ? &has_tab
                                                    : NULL) - get_indent();
 
@@ -1772 +1779 @@
                                 ? (st_old.st_mode & 0020)
                                 : (st_old.st_mode & 0002))))
         {
-            int tt;
+            int tt = msg_didany;
 
             /* avoid a wait_return for this message, it's annoying */
-            tt = msg_didany;
             EMSG2(_("E137: Viminfo file is not writable: %s"), fname);
             msg_didany = tt;
             fclose(fp_in);
@@ -2458 +2464 @@
 #ifdef FEAT_AUTOCMD
         apply_autocmds(EVENT_BUFFILEPOST, NULL, NULL, FALSE, curbuf);
 #endif
+        /* Change directories when the 'acd' option is set. */
+        DO_AUTOCHDIR
     }
     /* print full file name if :cd used */
     fileinfo(FALSE, FALSE, eap->forceit);
@@ -2675 +2683 @@
                                  eap, eap->append, eap->forceit, TRUE, FALSE);
 
         /* After ":saveas fname" reset 'readonly'. */
-        if (eap->cmdidx == CMD_saveas && retval == OK)
-            curbuf->b_p_ro = FALSE;
+        if (eap->cmdidx == CMD_saveas)
+        {
+            if (retval == OK)
+                curbuf->b_p_ro = FALSE;
+            /* Change directories when the 'acd' option is set. */
+            DO_AUTOCHDIR
+        }
     }
 
 theend:
@@ -3547 +3560 @@
         foldUpdateAll(curwin);
 #endif
 
-#ifdef FEAT_AUTOCHDIR
-        if (p_acd && curbuf->b_ffname != NULL
-                                     && vim_chdirfile(curbuf->b_ffname) == OK)
-            shorten_fnames(TRUE);
-#endif
+        /* Change directories when the 'acd' option is set. */
+        DO_AUTOCHDIR
+
         /*
          * Careful: open_buffer() and apply_autocmds() may change the current
          * buffer and window.
@@ -3718 +3729 @@
     if (p_im)
         need_start_insertmode = TRUE;
 
-#ifdef FEAT_AUTOCHDIR
-    /* Change directories when the acd option is set on. */
-    if (p_acd && curbuf->b_ffname != NULL
-                                     && vim_chdirfile(curbuf->b_ffname) == OK)
-        shorten_fnames(TRUE);
-#endif
+    /* Change directories when the 'acd' option is set. */
+    DO_AUTOCHDIR
 
 #if defined(FEAT_SUN_WORKSHOP) || defined(FEAT_NETBEANS_INTG)
     if (gui.in_use && curbuf->b_ffname != NULL)

src/ex_cmds.h

@@ -262 +262 @@
 EX(CMD_comclear,        "comclear",     ex_comclear,
                         TRLBAR|CMDWIN),
 EX(CMD_compiler,        "compiler",     ex_compiler,
-                        BANG|TRLBAR|WORD1),
+                        BANG|TRLBAR|WORD1|CMDWIN),
 EX(CMD_continue,        "continue",     ex_continue,
                         TRLBAR|SBOXOK|CMDWIN),
 EX(CMD_confirm,         "confirm",      ex_wrongmodifier,

src/ex_docmd.c

@@ -58 +58 @@
 #endif
 
 #ifdef FEAT_EVAL
-static char_u   *do_one_cmd __ARGS((char_u **, int, struct condstack *, char_u *(*getline)(int, void *, int), void *cookie));
+static char_u   *do_one_cmd __ARGS((char_u **, int, struct condstack *, char_u *(*fgetline)(int, void *, int), void *cookie));
 #else
-static char_u   *do_one_cmd __ARGS((char_u **, int, char_u *(*getline)(int, void *, int), void *cookie));
+static char_u   *do_one_cmd __ARGS((char_u **, int, char_u *(*fgetline)(int, void *, int), void *cookie));
 static int      if_level = 0;           /* depth in :if */
 #endif
 static char_u   *find_command __ARGS((exarg_T *eap, int *full));
@@ -831 +831 @@
 
     /*
      * If requested, store and reset the global values controlling the
-     * exception handling (used when debugging).
+     * exception handling (used when debugging).  Otherwise clear it to avoid
+     * a bogus compiler warning when the optimizer uses inline functions...
      */
-    else if (flags & DOCMD_EXCRESET)
+    if (flags & DOCMD_EXCRESET)
         save_dbg_stuff(&debug_saved);
+    else
+        memset(&debug_saved, 0, 1);
 
     initial_trylevel = trylevel;
 
@@ -1574 +1577 @@
 #endif
 
 /*
- * If "getline" is get_loop_line(), return TRUE if the getline it uses equals
- * "func".  * Otherwise return TRUE when "getline" equals "func".
+ * If "fgetline" is get_loop_line(), return TRUE if the getline it uses equals
+ * "func".  * Otherwise return TRUE when "fgetline" equals "func".
  */
 /*ARGSUSED*/
     int
-getline_equal(getline, cookie, func)
-    char_u      *(*getline) __ARGS((int, void *, int));
-    void        *cookie;                /* argument for getline() */
+getline_equal(fgetline, cookie, func)
+    char_u      *(*fgetline) __ARGS((int, void *, int));
+    void        *cookie;                /* argument for fgetline() */
     char_u      *(*func) __ARGS((int, void *, int));
 {
 #ifdef FEAT_EVAL
     char_u              *(*gp) __ARGS((int, void *, int));
     struct loop_cookie *cp;
 
-    /* When "getline" is "get_loop_line()" use the "cookie" to find the
+    /* When "fgetline" is "get_loop_line()" use the "cookie" to find the
      * function that's orignally used to obtain the lines.  This may be nested
      * several levels. */
-    gp = getline;
+    gp = fgetline;
     cp = (struct loop_cookie *)cookie;
     while (gp == get_loop_line)
     {
@@ -1600 +1603 @@
     }
     return gp == func;
 #else
-    return getline == func;
+    return fgetline == func;
 #endif
 }
 
 #if defined(FEAT_EVAL) || defined(FEAT_MBYTE) || defined(PROTO)
 /*
- * If "getline" is get_loop_line(), return the cookie used by the original
+ * If "fgetline" is get_loop_line(), return the cookie used by the original
  * getline function.  Otherwise return "cookie".
  */
 /*ARGSUSED*/
     void *
-getline_cookie(getline, cookie)
-    char_u      *(*getline) __ARGS((int, void *, int));
-    void        *cookie;                /* argument for getline() */
+getline_cookie(fgetline, cookie)
+    char_u      *(*fgetline) __ARGS((int, void *, int));
+    void        *cookie;                /* argument for fgetline() */
 {
 # ifdef FEAT_EVAL
     char_u              *(*gp) __ARGS((int, void *, int));
     struct loop_cookie *cp;
 
-    /* When "getline" is "get_loop_line()" use the "cookie" to find the
+    /* When "fgetline" is "get_loop_line()" use the "cookie" to find the
      * cookie that's orignally used to obtain the lines.  This may be nested
      * several levels. */
-    gp = getline;
+    gp = fgetline;
     cp = (struct loop_cookie *)cookie;
     while (gp == get_loop_line)
     {
@@ -1648 +1651 @@
  * 5. parse arguments
  * 6. switch on command name
  *
- * Note: "getline" can be NULL.
+ * Note: "fgetline" can be NULL.
  *
  * This function may be called recursively!
  */
@@ -1663 +1666 @@
 #ifdef FEAT_EVAL
                             cstack,
 #endif
-                                    getline, cookie)
+                                    fgetline, cookie)
     char_u              **cmdlinep;
     int                 sourcing;
 #ifdef FEAT_EVAL
     struct condstack    *cstack;
 #endif
-    char_u              *(*getline) __ARGS((int, void *, int));
-    void                *cookie;                /* argument for getline() */
+    char_u              *(*fgetline) __ARGS((int, void *, int));
+    void                *cookie;                /* argument for fgetline() */
 {
     char_u              *p;
     linenr_T            lnum;
@@ -1698 +1701 @@
     if (quitmore
 #ifdef FEAT_EVAL
             /* avoid that a function call in 'statusline' does this */
-            && !getline_equal(getline, cookie, get_func_line)
+            && !getline_equal(fgetline, cookie, get_func_line)
 #endif
             )
         --quitmore;
@@ -1710 +1713 @@
     save_cmdmod = cmdmod;
     vim_memset(&cmdmod, 0, sizeof(cmdmod));
 
+    /* "#!anything" is handled like a comment. */
+    if ((*cmdlinep)[0] == '#' && (*cmdlinep)[1] == '!')
+        goto doend;
+
     /*
      * Repeat until no more command modifiers are found.
      */
@@ -1724 +1731 @@
 
         /* in ex mode, an empty line works like :+ */
         if (*ea.cmd == NUL && exmode_active
-                        && (getline_equal(getline, cookie, getexmodeline)
-                            || getline_equal(getline, cookie, getexline))
+                        && (getline_equal(fgetline, cookie, getexmodeline)
+                            || getline_equal(fgetline, cookie, getexline))
                         && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count)
         {
             ea.cmd = (char_u *)"+";
@@ -1914 +1921 @@
     /* Count this line for profiling if ea.skip is FALSE. */
     if (do_profiling == PROF_YES && !ea.skip)
     {
-        if (getline_equal(getline, cookie, get_func_line))
-            func_line_exec(getline_cookie(getline, cookie));
-        else if (getline_equal(getline, cookie, getsourceline))
+        if (getline_equal(fgetline, cookie, get_func_line))
+            func_line_exec(getline_cookie(fgetline, cookie));
+        else if (getline_equal(fgetline, cookie, getsourceline))
             script_line_exec();
     }
 #endif
@@ -2585 +2592 @@
  * The "ea" structure holds the arguments that can be used.
  */
     ea.cmdlinep = cmdlinep;
-    ea.getline = getline;
+    ea.getline = fgetline;
     ea.cookie = cookie;
 #ifdef FEAT_EVAL
     ea.cstack = cstack;
@@ -2623 +2630 @@
         do_throw(cstack);
     else if (check_cstack)
     {
-        if (source_finished(getline, cookie))
+        if (source_finished(fgetline, cookie))
             do_finish(&ea, TRUE);
-        else if (getline_equal(getline, cookie, get_func_line)
+        else if (getline_equal(fgetline, cookie, get_func_line)
                                                    && current_func_returned())
             do_return(&ea, TRUE, FALSE, NULL);
     }
@@ -6289 +6296 @@
     exarg_T     *eap;
 {
     tabpage_T   *tp;
-    int         h = tabline_height();
 
 # ifdef FEAT_CMDWIN
     if (cmdwin_type != 0)
@@ -6321 +6327 @@
                )
                 tabpage_close(eap->forceit);
         }
-
-    if (h != tabline_height())
-        shell_new_rows();
 }
 
 /*
@@ -6335 +6338 @@
 {
     tabpage_T   *tp;
     int         done;
-    int         h = tabline_height();
 
 # ifdef FEAT_CMDWIN
     if (cmdwin_type != 0)
@@ -6364 +6366 @@
                     break;
             }
         }
-
-    if (h != tabline_height())
-        shell_new_rows();
 }
 
 /*
@@ -6390 +6389 @@
 /*
  * Close tab page "tp", which is not the current tab page.
  * Note that autocommands may make "tp" invalid.
+ * Also takes care of the tab pages line disappearing when closing the
+ * last-but-one tab page.
  */
     void
 tabpage_close_other(tp, forceit)
@@ -6398 +6399 @@
 {
     int         done = 0;
     win_T       *wp;
+    int         h = tabline_height();
 
     /* Limit to 1000 windows, autocommands may add a window while we close
      * one.  OK, so I'm paranoid... */
@@ -6411 +6413 @@
         if (!valid_tabpage(tp) || tp->tp_firstwin == wp)
             break;
     }
+
     redraw_tabline = TRUE;
+    if (h != tabline_height())
+        shell_new_rows();
 }
 
 /*
@@ -8417 +8422 @@
         else
             EMSG2(_(e_invarg2), eap->arg);
     }
+
+    /* Make sure redirection is not off.  Can happen for cmdline completion
+     * that indirectly invokes a command to catch its output. */
+    if (redir_fd != NULL
+#ifdef FEAT_EVAL
+                          || redir_reg || redir_vname
+#endif
+                                                        )
+        redir_off = FALSE;
 }
 
 /*

src/ex_getln.c

@@ -324 +324 @@
      */
     for (;;)
     {
+        redir_off = TRUE;       /* Don't redirect the typed command.
+                                   Repeated, because a ":redir" inside
+                                   completion may switch it on. */
 #ifdef USE_ON_FLY_SCROLL
         dont_scroll = FALSE;    /* allow scrolling here */
 #endif
@@ -4521 +4524 @@
     flags |= EW_FILE | EW_EXEC;
 
     /* For an absolute name we don't use $PATH. */
-    if ((pat[0] == '.' && (vim_ispathsep(pat[1])
+    if (mch_isFullName(pat))
+        path = (char_u *)" ";
+    else if ((pat[0] == '.' && (vim_ispathsep(pat[1])
                             || (pat[1] == '.' && vim_ispathsep(pat[2])))))
         path = (char_u *)".";
     else
@@ -4534 +4539 @@
     ga_init2(&ga, (int)sizeof(char *), 10);
     for (s = path; *s != NUL; s = e)
     {
+        if (*s == ' ')
+            ++s;        /* Skip space used for absolute path name. */
+
 #if defined(MSDOS) || defined(MSWIN) || defined(OS2)
         e = vim_strchr(s, ';');
 #else
@@ -5982 +5990 @@
     typestr[0] = cmdwin_type;
     typestr[1] = NUL;
     apply_autocmds(EVENT_CMDWINENTER, typestr, typestr, FALSE, curbuf);
+    if (restart_edit != 0)      /* autocmd with ":startinsert" */
+        stuffcharReadbuff(K_NOP);
 # endif
 
     i = RedrawingDisabled;

src/fileio.c

@@ -316 +316 @@
      * display the line. */
     ex_no_reprint = TRUE;
 
+    /* don't display the file info for another buffer now */
+    need_fileinfo = FALSE;
+
     /*
      * For Unix: Use the short file name whenever possible.
      * Avoids problems with networks and when directory names are changed.
@@ -6450 +6453 @@
     int         old_ro = buf->b_p_ro;
     buf_T       *savebuf;
     int         saved = OK;
-#ifdef FEAT_AUTOCMD
     aco_save_T  aco;
 
     /* set curwin/curbuf for "buf" and save some things */
     aucmd_prepbuf(&aco, buf);
-#else
-    buf_T       *save_curbuf = curbuf;
-
-    curbuf = buf;
-    curwin->w_buffer = buf;
-#endif
 
     /* We only want to read the text from the file, not reset the syntax
      * highlighting, clear marks, diff status, etc.  Force the fileformat
@@ -6573 +6569 @@
             curbuf->b_p_ro |= old_ro;
     }
 
-#ifdef FEAT_AUTOCMD
     /* restore curwin/curbuf and a few other things */
     aucmd_restbuf(&aco);
     /* Careful: autocommands may have made "buf" invalid! */
-#else
-    curwin->w_buffer = save_curbuf;
-    curbuf = save_curbuf;
-#endif
 }
 
 /*ARGSUSED*/
@@ -6992 +6983 @@
     {"FocusLost",       EVENT_FOCUSLOST},
     {"FuncUndefined",   EVENT_FUNCUNDEFINED},
     {"GUIEnter",        EVENT_GUIENTER},
+    {"GUIFailed",       EVENT_GUIFAILED},
     {"InsertChange",    EVENT_INSERTCHANGE},
     {"InsertEnter",     EVENT_INSERTENTER},
     {"InsertLeave",     EVENT_INSERTLEAVE},
@@ -8088 +8080 @@
  * Search a window for the current buffer.  Save the cursor position and
  * screen offset.
  * Set "curbuf" and "curwin" to match "buf".
+ * When FEAT_AUTOCMD is not defined another version is used, see below.
  */
     void
 aucmd_prepbuf(aco, buf)
@@ -8151 +8144 @@
 /*
  * Cleanup after executing autocommands for a (hidden) buffer.
  * Restore the window as it was (if possible).
+ * When FEAT_AUTOCMD is not defined another version is used, see below.
  */
     void
 aucmd_restbuf(aco)
@@ -9063 +9057 @@
     return retval;
 }
 
+#else   /* FEAT_AUTOCMD */
+
+/*
+ * Prepare for executing commands for (hidden) buffer "buf".
+ * This is the non-autocommand version, it simply saves "curbuf" and sets
+ * "curbuf" and "curwin" to match "buf".
+ */
+    void
+aucmd_prepbuf(aco, buf)
+    aco_save_T  *aco;           /* structure to save values in */
+    buf_T       *buf;           /* new curbuf */
+{
+    aco->save_buf = buf;
+    curbuf = buf;
+    curwin->w_buffer = buf;
+}
+
+/*
+ * Restore after executing commands for a (hidden) buffer.
+ * This is the non-autocommand version.
+ */
+    void
+aucmd_restbuf(aco)
+    aco_save_T  *aco;           /* structure holding saved values */
+{
+    curbuf = aco->save_buf;
+    curwin->w_buffer = curbuf;
+}
+
 #endif  /* FEAT_AUTOCMD */
 
+
 #if defined(FEAT_AUTOCMD) || defined(FEAT_WILDIGN) || defined(PROTO)
 /*
  * Try matching a filename with a "pattern" ("prog" is NULL), or use the

src/getchar.c

@@ -1451 +1451 @@
 {
     updatescript(0);
 #ifdef FEAT_EVAL
-    garbage_collect();
+    if (may_garbage_collect)
+        garbage_collect();
 #endif
 }
 
@@ -1502 +1503 @@
     int         i;
 #endif
 
+#ifdef FEAT_EVAL
+    /* Do garbage collection when garbagecollect() was called previously and
+     * we are now at the toplevel. */
+    if (may_garbage_collect && want_garbage_collect)
+        garbage_collect();
+#endif
+
     /*
      * If a character was put back with vungetc, it was already processed.
      * Return it directly.
@@ -1511 +1519 @@
         c = old_char;
         old_char = -1;
         mod_mask = old_mod_mask;
-        return c;
     }
-
-    mod_mask = 0x0;
-    last_recorded_len = 0;
-    for (;;)                    /* this is done twice if there are modifiers */
+    else
     {
+      mod_mask = 0x0;
+      last_recorded_len = 0;
+      for (;;)                  /* this is done twice if there are modifiers */
+      {
         if (mod_mask)           /* no mapping after modifier has been read */
         {
             ++no_mapping;
@@ -1695 +1703 @@
         }
 #endif
 
-        return c;
+        break;
+      }
     }
+
+#ifdef FEAT_EVAL
+    /*
+     * In the main loop "may_garbage_collect" can be set to do garbage
+     * collection in the first next vgetc().  It's disabled after that to
+     * avoid internally used Lists and Dicts to be freed.
+     */
+    may_garbage_collect = FALSE;
+#endif
+
+    return c;
 }
 
 /*

src/globals.h

@@ -300 +300 @@
 #endif
 
 #ifdef FEAT_EVAL
-EXTERN scid_T   current_SID INIT(= 0);      /* ID of script being sourced or
-                                               was sourced to define the
-                                               current function. */
+/* Garbage collection can only take place when we are sure there are no Lists
+ * or Dictionaries being used internally.  This is flagged with
+ * "may_garbage_collect" when we are at the toplevel.
+ * "want_garbage_collect" is set by the garbagecollect() function, which means
+ * we do garbage collection before waiting for a char at the toplevel. */
+EXTERN int      may_garbage_collect INIT(= FALSE);
+EXTERN int      want_garbage_collect INIT(= FALSE);
+
+/* ID of script being sourced or was sourced to define the current function. */
+EXTERN scid_T   current_SID INIT(= 0);
 #endif
 
 #if defined(FEAT_EVAL) || defined(FEAT_SYN_HL)
@@ -1441 +1448 @@
 EXTERN char_u e_readonly[]      INIT(= N_("E45: 'readonly' option is set (add ! to override)"));
 #ifdef FEAT_EVAL
 EXTERN char_u e_readonlyvar[]   INIT(= N_("E46: Cannot change read-only variable \"%s\""));
-EXTERN char_u e_readonlysbx[]   INIT(= N_("E46: Cannot set variable in the sandbox: \"%s\""));
+EXTERN char_u e_readonlysbx[]   INIT(= N_("E794: Cannot set variable in the sandbox: \"%s\""));
 #endif
 #ifdef FEAT_QUICKFIX
 EXTERN char_u e_readerrf[]      INIT(= N_("E47: Error while reading errorfile"));

src/gui_at_fs.c

@@ -1861 +1861 @@
     XtPointer   pnew;
 {
     SFDir       *dir;
-    int         nw;
+    int         nw = (int)(long)pnew;
 
     dir = &(SFdirs[SFdirPtr + (int)(long)n]);
 
 #ifdef FEAT_GUI_NEXTAW
-    if ((int)(long)pnew < 0)
+    if (nw < 0)
     {
-        if ((int)(long)pnew > -SFvScrollHeight)
-            (int)(long)pnew = -1;
+        if (nw > -SFvScrollHeight)
+            nw = -1;
         else
-            (int)(long)pnew = -SFlistSize;
+            nw = -SFlistSize;
     }
-    else if ((int)(long)pnew > 0)
+    else if (nw > 0)
     {
-        if ((int)(long)pnew < SFvScrollHeight)
-            (int)(long)pnew = 1;
+        if (nw < SFvScrollHeight)
+            nw = 1;
         else
-            (int)(long)pnew = SFlistSize;
+            nw = SFlistSize;
     }
 #endif
-    nw = dir->vOrigin + (int)(long)pnew;
+    nw += dir->vOrigin;
 
     if (nw > dir->nEntries - SFlistSize)
         nw = dir->nEntries - SFlistSize;
@@ -1941 +1941 @@
     XtPointer   pnew;
 {
     SFDir       *dir;
-    int         nw;
+    int         nw = (int)(long)pnew;
 
     dir = &(SFdirs[SFdirPtr + (int)(long)n]);
 
 #ifdef FEAT_GUI_NEXTAW
-    if ((int)(long)pnew < 0)
+    if (nw < 0)
     {
-        if ((int)(long)pnew > -SFhScrollWidth)
-            (int)(long)pnew = -1;
+        if (nw > -SFhScrollWidth)
+            nw = -1;
         else
-            (int)(long)pnew = -SFcharsPerEntry;
+            nw = -SFcharsPerEntry;
     }
-    else if ((int)(long)pnew > 0)
+    else if (nw > 0)
     {
-        if ((int)(long)pnew < SFhScrollWidth)
-            (int)(long)pnew = 1;
+        if (nw < SFhScrollWidth)
+            nw = 1;
         else
-            (int)(long)pnew = SFcharsPerEntry;
+            nw = SFcharsPerEntry;
     }
 #endif
-    nw = dir->hOrigin + (int)(long)pnew;
+    nw += dir->hOrigin;
 
     if (nw > dir->nChars - SFcharsPerEntry)
         nw = dir->nChars - SFcharsPerEntry;
@@ -2038 +2038 @@
     XtPointer   client_data;
     XtPointer   pnew;
 {
-    int         nw;
+    int         nw = (int)(long)pnew;
     float       f;
 
 #ifdef FEAT_GUI_NEXTAW
-    if ((int)(long)pnew < 0)
+    if (nw < 0)
     {
-        if ((int)(long)pnew > -SFpathScrollWidth)
-            (int)(long)pnew = -1;
+        if (nw > -SFpathScrollWidth)
+            nw = -1;
         else
-            (int)(long)pnew = -3;
+            nw = -3;
     }
-    else if ((int)(long)pnew > 0)
+    else if (nw > 0)
     {
-        if ((int)(long)pnew < SFpathScrollWidth)
-            (int)(long)pnew = 1;
+        if (nw < SFpathScrollWidth)
+            nw = 1;
         else
-            (int)(long)pnew = 3;
+            nw = 3;
     }
 #endif
-    nw = SFdirPtr + (int)(long)pnew;
+    nw += SFdirPtr;
 
     if (nw > SFdirEnd - 3)
         nw = SFdirEnd - 3;

src/gui_beval.c

@@ -926 +926 @@
 #  define IS_NONPRINTABLE(c) (((c) < 0x20 && (c) != TAB && (c) != NL) \
                               || (c) == DEL)
     static void
-set_printable_label_text(GtkLabel *label, char_u *msg)
+set_printable_label_text(GtkLabel *label, char_u *text)
 {
     char_u          *convbuf = NULL;
     char_u          *buf;
@@ -940 +940 @@
     /* Convert to UTF-8 if it isn't already */
     if (output_conv.vc_type != CONV_NONE)
     {
-        convbuf = string_convert(&output_conv, msg, NULL);
+        convbuf = string_convert(&output_conv, text, NULL);
         if (convbuf != NULL)
-            msg = convbuf;
+            text = convbuf;
     }
 
     /* First let's see how much we need to allocate */
     len = 0;
-    for (p = msg; *p != NUL; p += charlen)
+    for (p = text; *p != NUL; p += charlen)
     {
         if ((*p & 0x80) == 0)   /* be quick for ASCII */
         {
@@ -992 +992 @@
                                      (unsigned long)pixel, &color);
 
         pdest = buf;
-        p = msg;
+        p = text;
         while (*p != NUL)
         {
             /* Be quick for ASCII */

src/gui.c

@@ -187 +187 @@
 #endif
 
 #ifdef FEAT_AUTOCMD
-    /* If the GUI started successfully, trigger the GUIEnter event */
-    if (gui.in_use)
-        apply_autocmds(EVENT_GUIENTER, NULL, NULL, FALSE, curbuf);
+    /* If the GUI started successfully, trigger the GUIEnter event, otherwise
+     * the GUIFailed event. */
+    apply_autocmds(gui.in_use ? EVENT_GUIENTER : EVENT_GUIFAILED,
+                                                   NULL, NULL, FALSE, curbuf);
 #endif
 
     --recursive;
@@ -3733 +3734 @@
     if (dont_scroll || input_available())
         return;
 #endif
+#ifdef FEAT_INS_EXPAND
+    /* Disallow scrolling the current window when the completion popup menu is
+     * visible. */
+    if ((sb->wp == NULL || sb->wp == curwin) && pum_visible())
+        return;
+#endif
 
 #ifdef FEAT_RIGHTLEFT
     if (sb->wp == NULL && curwin->w_p_rl)
@@ -4207 +4214 @@
         updateWindow(wp);   /* update window, status line, and cmdline */
     }
 
+#ifdef FEAT_INS_EXPAND
+    /* May need to redraw the popup menu. */
+    if (pum_visible())
+        pum_redraw();
+#endif
+
     return (wp == curwin && !equalpos(curwin->w_cursor, old_cursor));
 }
 
@@ -4515 +4528 @@
     int         y;
 {
     win_T       *wp;
-    char_u      st[6];
+    char_u      st[8];
 
     /* Ignore this while still starting up. */
     if (!gui.in_use || gui.starting)
@@ -4603 +4616 @@
     /* Don't move the mouse when it's left or right of the Vim window */
     if (x < 0 || x > Columns * gui.char_width)
         return;
+    if (y >= 0
 # ifdef FEAT_WINDOWS
-    if (Y_2_ROW(y) >= tabline_height())
-# else
-    if (y >= 0)
+            && Y_2_ROW(y) >= tabline_height()
 # endif
+       )
         wp = xy2win(x, y);
     if (wp != curwin && wp != NULL)     /* If in other than current window */
     {

src/gui_gtk.c

@@ -957 +957 @@
 get_menu_position(vimmenu_T *menu)
 {
     vimmenu_T   *node;
-    int         index = 0;
+    int         idx = 0;
 
     for (node = menu->parent->children; node != menu; node = node->next)
     {
         g_return_val_if_fail(node != NULL, -1);
-        ++index;
+        ++idx;
     }
 
-    return index;
+    return idx;
 }
 #endif /* FEAT_TOOLBAR && HAVE_GTK2 */
 
@@ -2127 +2127 @@
     char    **ync;  /* "yes no cancel" */
     char    **buttons;
     int     n_buttons = 0;
-    int     index;
+    int     idx;
 
     button_string = vim_strsave(button_string); /* must be writable */
     if (button_string == NULL)
@@ -2161 +2161 @@
      * Well, apparently somebody changed his mind: with GTK 2.2.4 it works the
      * other way around...
      */
-    for (index = 1; index <= n_buttons; ++index)
+    for (idx = 1; idx <= n_buttons; ++idx)
     {
         char    *label;
         char_u  *label8;
 
-        label = buttons[index - 1];
+        label = buttons[idx - 1];
         /*
          * Perform some guesswork to find appropriate stock items for the
          * buttons.  We have to compare with a sample of the translated
@@ -2188 +2188 @@
             else if (button_equal(label, "Cancel")) label = GTK_STOCK_CANCEL;
         }
         label8 = CONVERT_TO_UTF8((char_u *)label);
-        gtk_dialog_add_button(dialog, (const gchar *)label8, index);
+        gtk_dialog_add_button(dialog, (const gchar *)label8, idx);
         CONVERT_TO_UTF8_FREE(label8);
     }
 

src/gui_gtk_x11.c

@@ -3233 +3233 @@
 on_select_tab(
         GtkNotebook     *notebook,
         GtkNotebookPage *page,
-        gint            index,
+        gint            idx,
         gpointer        data)
 {
     if (!ignore_tabline_evt)
     {
-        if (send_tabline_event(index + 1) && gtk_main_level() > 0)
+        if (send_tabline_event(idx + 1) && gtk_main_level() > 0)
             gtk_main_quit();
     }
 }
@@ -5303 +5303 @@
 # ifdef HAVE_GTK2
     if (font != NOFONT)
     {
-        char    *name = pango_font_description_to_string(font);
+        char    *pangoname = pango_font_description_to_string(font);
 
-        if (name != NULL)
+        if (pangoname != NULL)
         {
-            char_u      *s = vim_strsave((char_u *)name);
+            char_u      *s = vim_strsave((char_u *)pangoname);
 
-            g_free(name);
+            g_free(pangoname);
             return s;
         }
     }
@@ -6241 +6241 @@
 {
     GdkGCValues values;
     GdkGC *invert_gc;
-    GdkColor foreground;
-    GdkColor background;
 
     if (gui.drawarea->window == NULL)
         return;
 
-    foreground.pixel = gui.norm_pixel ^ gui.back_pixel;
-    background.pixel = gui.norm_pixel ^ gui.back_pixel;
-
-    values.foreground = foreground;
-    values.background = background;
+    values.foreground.pixel = gui.norm_pixel ^ gui.back_pixel;
+    values.background.pixel = gui.norm_pixel ^ gui.back_pixel;
     values.function = GDK_XOR;
     invert_gc = gdk_gc_new_with_values(gui.drawarea->window,
                                        &values,
                                        GDK_GC_FOREGROUND |
                                        GDK_GC_BACKGROUND |
                                        GDK_GC_FUNCTION);
-    gdk_gc_set_exposures(invert_gc, gui.visibility != GDK_VISIBILITY_UNOBSCURED);
+    gdk_gc_set_exposures(invert_gc, gui.visibility !=
+                                                   GDK_VISIBILITY_UNOBSCURED);
     gdk_draw_rectangle(gui.drawarea->window, invert_gc,
                        TRUE,
                        FILL_X(c), FILL_Y(r),

src/gui_xmebw.c

@@ -47 +47 @@
 #include "gui_xmebwp.h"
 
 /* Provide some missing wrappers, which are missed from the LessTif
- * implementation.
+ * implementation.  Also missing in Motif 1.2 and earlier.
  *
  * We neither use XmeGetPixmapData or _XmGetPixmapData, since with LessTif the
  * pixmap will not appear in it's caches properly. We cache the interresting
  * values in XmEnhancedButtonPart instead ourself.
  */
-#ifdef LESSTIF_VERSION
+#if defined(LESSTIF_VERSION) || (XmVersion <= 1002)
 # ifndef Lab_IsMenupane
 #  define Lab_IsMenupane(w) (Lab_MenuType(w) == (int)XmMENU_POPUP || \
                     Lab_MenuType(w) == (int)XmMENU_PULLDOWN)
@@ -480 +480 @@
             || (eb->core.height <= 2 * eb->primitive.highlight_thickness))
         return;
 
-#ifndef LESSTIF_VERSION
+#if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
     {
         XmDisplay       dpy;
 
@@ -641 +641 @@
     GC          tmp_gc = NULL;
     Boolean     replaceGC = False;
     Boolean     deadjusted = False;
-#ifndef LESSTIF_VERSION
+#if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
     XmDisplay   dpy = (XmDisplay)XmGetXmDisplay(XtDisplay(eb));
     Boolean     etched_in = dpy->display.enable_etched_in_menu;
 #else
@@ -726 +726 @@
         if ((((ShellWidget) XtParent(XtParent(eb)))->shell.popped_up)
                 && _XmGetInDragMode((Widget) eb))
         {
-#ifndef LESSTIF_VERSION
+#if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
             XmDisplay dpy = (XmDisplay) XmGetXmDisplay(XtDisplay(wid));
             Boolean etched_in = dpy->display.enable_etched_in_menu;
 #else
@@ -810 +810 @@
 
     if (Lab_IsMenupane(eb))
     {
-#ifndef LESSTIF_VERSION
+#if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
         XmDisplay dpy = (XmDisplay) XmGetXmDisplay(XtDisplay(wid));
         Boolean etched_in = dpy->display.enable_etched_in_menu;
 #else
@@ -1150 +1150 @@
 Redisplay(Widget w, XEvent *event, Region region)
 {
     XmEnhancedButtonWidget  eb = (XmEnhancedButtonWidget) w;
-#ifndef LESSTIF_VERSION
+#if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
     XmDisplay               dpy;
     XtEnum                  default_button_emphasis;
 #endif
@@ -1162 +1162 @@
     if (!XtIsRealized((Widget)eb))
         return;
 
-#ifndef LESSTIF_VERSION
+#if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
     dpy = (XmDisplay)XmGetXmDisplay(XtDisplay(eb));
     default_button_emphasis = dpy->display.default_button_emphasis;
 #endif
@@ -1241 +1241 @@
     {
         int adjust = 0;
 
-#ifndef LESSTIF_VERSION
+#if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
         /*
          *  NOTE: PushButton has two types of shadows: primitive-shadow and
          *  default-button-shadow.  If pushbutton is in a menu only primitive
@@ -1289 +1289 @@
                           adjust, adjust, rectwidth, rectheight, borderwidth);
             }
 
-#ifndef LESSTIF_VERSION
+#if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
             switch (default_button_emphasis)
             {
                 case XmINTERNAL_HIGHLIGHT:
@@ -1365 +1365 @@
                     default_button_shadow_thickness =
                                eb->pushbutton.default_button_shadow_thickness;
 
-#ifndef LESSTIF_VERSION
+#if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
                 /*
                  * Compute location of bounding box to contain the
                  * defaultButtonShadow.

src/hardcopy.c

@@ -1794 +1794 @@
     static int
 prt_resfile_next_line()
 {
-    int     index;
+    int     idx;
 
     /* Move to start of next line and then find end of line */
-    index = prt_resfile.line_end + 1;
-    while (index < prt_resfile.len)
+    idx = prt_resfile.line_end + 1;
+    while (idx < prt_resfile.len)
     {
-        if (prt_resfile.buffer[index] != PSLF && prt_resfile.buffer[index]
-                                                                        != PSCR)
+        if (prt_resfile.buffer[idx] != PSLF && prt_resfile.buffer[idx] != PSCR)
             break;
-        index++;
+        idx++;
     }
-    prt_resfile.line_start = index;
+    prt_resfile.line_start = idx;
 
-    while (index < prt_resfile.len)
+    while (idx < prt_resfile.len)
     {
-        if (prt_resfile.buffer[index] == PSLF || prt_resfile.buffer[index]
-                                                                        == PSCR)
+        if (prt_resfile.buffer[idx] == PSLF || prt_resfile.buffer[idx] == PSCR)
             break;
-        index++;
+        idx++;
     }
-    prt_resfile.line_end = index;
+    prt_resfile.line_end = idx;
 
-    return (index < prt_resfile.len);
+    return (idx < prt_resfile.len);
 }
 
     static int
@@ -1837 +1835 @@
 prt_resfile_skip_nonws(offset)
     int     offset;
 {
-    int     index;
+    int     idx;
 
-    index = prt_resfile.line_start + offset;
-    while (index < prt_resfile.line_end)
+    idx = prt_resfile.line_start + offset;
+    while (idx < prt_resfile.line_end)
     {
-        if (isspace(prt_resfile.buffer[index]))
-            return index - prt_resfile.line_start;
-        index++;
+        if (isspace(prt_resfile.buffer[idx]))
+            return idx - prt_resfile.line_start;
+        idx++;
     }
     return -1;
 }
@@ -1853 +1851 @@
 prt_resfile_skip_ws(offset)
     int     offset;
 {
-    int     index;
+    int     idx;
 
-    index = prt_resfile.line_start + offset;
-    while (index < prt_resfile.line_end)
+    idx = prt_resfile.line_start + offset;
+    while (idx < prt_resfile.line_end)
     {
-        if (!isspace(prt_resfile.buffer[index]))
-            return index - prt_resfile.line_start;
-        index++;
+        if (!isspace(prt_resfile.buffer[idx]))
+            return idx - prt_resfile.line_start;
+        idx++;
     }
     return -1;
 }
@@ -2478 +2476 @@
     char_u      *p_encoding;
     struct prt_ps_encoding_S *p_mbenc;
     struct prt_ps_encoding_S *p_mbenc_first;
-    struct prt_ps_charset_S  *p_mbchar;
+    struct prt_ps_charset_S  *p_mbchar = NULL;
 #endif
 
 #if 0
@@ -2516 +2514 @@
     if (!(props & ENC_8BIT) && ((*p_pmcs != NUL) || !(props & ENC_UNICODE)))
     {
         p_mbenc_first = NULL;
-        p_mbchar = NULL;
         for (cmap = 0; cmap < NUM_ELEMENTS(prt_ps_mbfonts); cmap++)
             if (prt_match_encoding((char *)p_encoding, &prt_ps_mbfonts[cmap],
                                                                     &p_mbenc))

src/if_cscope.c

@@ -989 +989 @@
 {
     int i;
     char *cmd;
-    char **matches, **contexts;
-    int nummatches[CSCOPE_MAX_CONNECTIONS], totmatches, matched;
+    int nummatches[CSCOPE_MAX_CONNECTIONS], totmatches;
 #ifdef FEAT_QUICKFIX
     char cmdletter;
     char *qfpos;
@@ -1141 +1140 @@
     else
 #endif /* FEAT_QUICKFIX */
     {
+        char **matches = NULL, **contexts = NULL;
+        int matched = 0;
+
         /* read output */
         cs_fill_results((char *)pat, totmatches, nummatches, &matches,
                                                          &contexts, &matched);

src/if_perl.xs

@@ -155 +155 @@
 static int (*perl_run)(PerlInterpreter*);
 static int (*perl_parse)(PerlInterpreter*, XSINIT_t, int, char**, char**);
 static void* (*Perl_get_context)(void);
-static void (*Perl_croak)(pTHX_ const char*, ...) __attribute__((noreturn));
-static void (*Perl_croak_nocontext)(const char*, ...) __attribute__((noreturn));
+static void (*Perl_croak)(pTHX_ const char*, ...);
+static void (*Perl_croak_nocontext)(const char*, ...);
 static I32 (*Perl_dowantarray)(pTHX);
 static void (*Perl_free_tmps)(pTHX);
 static HV* (*Perl_gv_stashpv)(pTHX_ const char*, I32);
@@ -1056 +1056 @@
     int i;
     long lnum;
     char *line;
-    buf_T *savebuf;
     PPCODE:
     if (buf_valid(vimbuf))
     {
@@ -1069 +1068 @@
             line = SvPV(ST(i),PL_na);
             if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
             {
-                savebuf = curbuf;
-                curbuf = vimbuf;
+                aco_save_T      aco;
+
+                /* set curwin/curbuf for "vimbuf" and save some things */
+                aucmd_prepbuf(&aco, vimbuf);
+
                 if (u_savesub(lnum) == OK)
                 {
                     ml_replace(lnum, (char_u *)line, TRUE);
                     changed_bytes(lnum, 0);
                 }
-                curbuf = savebuf;
+
+                /* restore curwin/curbuf and a few other things */
+                aucmd_restbuf(&aco);
+                /* Careful: autocommands may have made "vimbuf" invalid! */
             }
         }
     }
@@ -1087 +1092 @@
 
     PREINIT:
     long i, lnum = 0, count = 0;
-    buf_T *savebuf;
     PPCODE:
     if (buf_valid(vimbuf))
     {
@@ -1114 +1118 @@
             {
                 if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count)
                 {
-                    savebuf = curbuf;
-                    curbuf = vimbuf;
+                    aco_save_T  aco;
+
+                    /* set curwin/curbuf for "vimbuf" and save some things */
+                    aucmd_prepbuf(&aco, vimbuf);
+
                     if (u_savedel(lnum, 1) == OK)
                     {
                         ml_delete(lnum, 0);
                         deleted_lines_mark(lnum, 1L);
-                        if (savebuf == curbuf)
+                        if (aco.save_buf == curbuf)
                             check_cursor();
                     }
-                    curbuf = savebuf;
+
+                    /* restore curwin/curbuf and a few other things */
+                    aucmd_restbuf(&aco);
+                    /* Careful: autocommands may have made "vimbuf" invalid! */
+
                     update_curbuf(VALID);
                 }
             }
@@ -1138 +1149 @@
     int         i;
     long        lnum;
     char        *line;
-    buf_T       *savebuf;
     PPCODE:
     if (buf_valid(vimbuf))
     {
@@ -1151 +1161 @@
             line = SvPV(ST(i),PL_na);
             if (lnum >= 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
             {
-                savebuf = curbuf;
-                curbuf = vimbuf;
+                aco_save_T      aco;
+
+                /* set curwin/curbuf for "vimbuf" and save some things */
+                aucmd_prepbuf(&aco, vimbuf);
+
                 if (u_inssub(lnum + 1) == OK)
                 {
                     ml_append(lnum, (char_u *)line, (colnr_T)0, FALSE);
                     appended_lines_mark(lnum, 1L);
                 }
-                curbuf = savebuf;
+
+                /* restore curwin/curbuf and a few other things */
+                aucmd_restbuf(&aco);
+                /* Careful: autocommands may have made "vimbuf" invalid! */
+
                 update_curbuf(VALID);
             }
         }

src/if_ruby.c

@@ -643 +643 @@
 
 static VALUE set_buffer_line(buf_T *buf, linenr_T n, VALUE str)
 {
-    buf_T *savebuf = curbuf;
-    char *line = STR2CSTR(str);
+    char        *line = STR2CSTR(str);
+    aco_save_T  aco;
+
+    if (n > 0 && n <= buf->b_ml.ml_line_count && line != NULL)
+    {
+        /* set curwin/curbuf for "buf" and save some things */
+        aucmd_prepbuf(&aco, buf);
 
-    if (n > 0 && n <= buf->b_ml.ml_line_count && line != NULL) {
-        curbuf = buf;
         if (u_savesub(n) == OK) {
             ml_replace(n, (char_u *)line, TRUE);
             changed();
@@ -655 +658 @@
             syn_changed(n); /* recompute syntax hl. for this line */
 #endif
         }
-        curbuf = savebuf;
+
+        /* restore curwin/curbuf and a few other things */
+        aucmd_restbuf(&aco);
+        /* Careful: autocommands may have made "buf" invalid! */
+
         update_curbuf(NOT_VALID);
     }
-    else {
+    else
+    {
         rb_raise(rb_eIndexError, "index %d out of buffer", n);
         return Qnil; /* For stop warning */
     }
@@ -676 +684 @@
 
 static VALUE buffer_delete(VALUE self, VALUE num)
 {
-    buf_T *buf = get_buf(self);
-    buf_T *savebuf = curbuf;
-    long n = NUM2LONG(num);
+    buf_T       *buf = get_buf(self);
+    long        n = NUM2LONG(num);
+    aco_save_T  aco;
+
+    if (n > 0 && n <= buf->b_ml.ml_line_count)
+    {
+        /* set curwin/curbuf for "buf" and save some things */
+        aucmd_prepbuf(&aco, buf);
 
-    if (n > 0 && n <= buf->b_ml.ml_line_count) {
-        curbuf = buf;
         if (u_savedel(n, 1) == OK) {
             ml_delete(n, 0);
 
@@ -691 +702 @@
 
             changed();
         }
-        curbuf = savebuf;
+
+        /* restore curwin/curbuf and a few other things */
+        aucmd_restbuf(&aco);
+        /* Careful: autocommands may have made "buf" invalid! */
+
         update_curbuf(NOT_VALID);
     }
-    else {
+    else
+    {
         rb_raise(rb_eIndexError, "index %d out of buffer", n);
     }
     return Qnil;
@@ -702 +718 @@
 
 static VALUE buffer_append(VALUE self, VALUE num, VALUE str)
 {
-    buf_T *buf = get_buf(self);
-    buf_T *savebuf = curbuf;
-    char *line = STR2CSTR(str);
-    long n = NUM2LONG(num);
+    buf_T       *buf = get_buf(self);
+    char        *line = STR2CSTR(str);
+    long        n = NUM2LONG(num);
+    aco_save_T  aco;
+
+    if (n >= 0 && n <= buf->b_ml.ml_line_count && line != NULL)
+    {
+        /* set curwin/curbuf for "buf" and save some things */
+        aucmd_prepbuf(&aco, buf);
 
-    if (n >= 0 && n <= buf->b_ml.ml_line_count && line != NULL) {
-        curbuf = buf;
         if (u_inssub(n + 1) == OK) {
             ml_append(n, (char_u *) line, (colnr_T) 0, FALSE);
 
@@ -718 +737 @@
 
             changed();
         }
-        curbuf = savebuf;
+
+        /* restore curwin/curbuf and a few other things */
+        aucmd_restbuf(&aco);
+        /* Careful: autocommands may have made "buf" invalid! */
+
         update_curbuf(NOT_VALID);
     }
     else {

src/macros.h

@@ -276 +276 @@
 # define MB_CHARLEN(p)          STRLEN(p)
 # define PTR2CHAR(p)            ((int)*(p))
 #endif
+
+#ifdef FEAT_AUTOCHDIR
+# define DO_AUTOCHDIR if (p_acd) do_autochdir();
+#else
+# define DO_AUTOCHDIR
+#endif

src/main.c

@@ -564 +564 @@
      */
     if (p_lpl)
     {
+# ifdef VMS     /* Somehow VMS doesn't handle the "**". */
+        source_runtime((char_u *)"plugin/*.vim", TRUE);
+# else
         source_runtime((char_u *)"plugin/**/*.vim", TRUE);
+# endif
         TIME_MSG("loading plugins");
     }
 #endif
@@ -1126 +1130 @@
          */
         update_curswant();
 
+#ifdef FEAT_EVAL
+        /*
+         * May perform garbage collection when waiting for a character, but
+         * only at the very toplevel.  Otherwise we may be using a List or
+         * Dict internally somewhere.
+         * "may_garbage_collect" is reset in vgetc() which is invoked through
+         * do_exmode() and normal_cmd().
+         */
+        may_garbage_collect = (!cmdwin && !noexmode);
+#endif
         /*
          * If we're invoked as ex, do a round of ex commands.
          * Otherwise, get and execute a normal mode command.
@@ -2281 +2295 @@
     mparm_T     *parmp;
 {
 #ifdef FEAT_WINDOWS
-    int         rewind;
+    int         dorewind;
     int         done = 0;
 
     /*
@@ -2338 +2352 @@
         ++autocmd_no_leave;
 #endif
 #ifdef FEAT_WINDOWS
-        rewind = TRUE;
+        dorewind = TRUE;
         while (done++ < 1000)
         {
-            if (rewind)
+            if (dorewind)
             {
                 if (parmp->window_layout == WIN_TABS)
                     goto_tabpage(1);
@@ -2360 +2374 @@
                     break;
                 curwin = curwin->w_next;
             }
-            rewind = FALSE;
+            dorewind = FALSE;
 #endif
             curbuf = curwin->w_buffer;
             if (curbuf->b_ml.ml_mfp == NULL)
@@ -2381 +2395 @@
                 check_swap_exists_action();
 #endif
 #ifdef FEAT_AUTOCMD
-                rewind = TRUE;          /* start again */
+                dorewind = TRUE;                /* start again */
 #endif
             }
 #ifdef FEAT_WINDOWS
@@ -3208 +3222 @@
      * Register for remote command execution with :serversend and --remote
      * unless there was a -X or a --servername '' on the command line.
      * Only register nongui-vim's with an explicit --servername argument.
+     * When running as root --servername is also required.
      */
     if (X_DISPLAY != NULL && parmp->servername != NULL && (
 #  ifdef FEAT_GUI
-                gui.in_use ||
+                (gui.in_use
+#   ifdef UNIX
+                 && getuid() != 0
+#   endif
+                ) ||
 #  endif
                 parmp->serverName_arg != NULL))
     {

src/Makefile

@@ -2177 +2177 @@
         cd $(SHADOWDIR)/xxd; ln -s ../../xxd/*.[ch] ../../xxd/Make* .
         if test -d $(RSRC_DIR); then \
                 cd $(SHADOWDIR); \
+                ln -s ../infplist.xml .; \
                 ln -s ../$(RSRC_DIR) ../os_mac.rsr.hqx ../dehqx.py .; \
         fi
         mkdir $(SHADOWDIR)/testdir
@@ -2260 +2261 @@
 auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in
         CC="$(CC) $(OSDEF_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh
 
-QUOTESED = sed -e 's/"/\\"/g' -e 's/\\"/"/' -e 's/\\";$$/";/'
+QUOTESED = sed -e 's/[\\"]/\\&/g' -e 's/\\"/"/' -e 's/\\";$$/";/'
 auto/pathdef.c: Makefile auto/config.mk
         -@echo creating $@
         -@echo '/* pathdef.c */' > $@

src/mbyte.c

@@ -311 +311 @@
 
 #define IDX_MACROMAN    57
     {"macroman",        ENC_8BIT + ENC_MACROMAN, 0},    /* Mac OS */
-#define IDX_COUNT       58
+#define IDX_DECMCS      58
+    {"dec-mcs",         ENC_8BIT,               0},     /* DEC MCS */
+#define IDX_HPROMAN8    59
+    {"hp-roman8",       ENC_8BIT,               0},     /* HP Roman8 */
+#define IDX_COUNT       60
 };
 
 /*
@@ -359 +363 @@
     {"932",             IDX_CP932},
     {"949",             IDX_CP949},
     {"936",             IDX_CP936},
+    {"gbk",             IDX_CP936},
+    {"gb18030",         IDX_CP936},     /* only 99% the same */
     {"950",             IDX_CP950},
     {"eucjp",           IDX_EUC_JP},
     {"unix-jis",        IDX_EUC_JP},
@@ -386 +392 @@
     {"950",             IDX_BIG5},
 #endif
     {"mac",             IDX_MACROMAN},
+    {"mac-roman",       IDX_MACROMAN},
     {NULL,              0}
 };
 
@@ -3507 +3514 @@
         add_to_input_buf(delkey, (int)sizeof(delkey));
 }
 
+/*
+ * Move the cursor left by "num_move_back" characters.
+ * Note that ins_left() checks im_is_preediting() to avoid breaking undo for
+ * these K_LEFT keys.
+ */
     static void
 im_correct_cursor(int num_move_back)
 {
@@ -3734 +3746 @@
     }
     else if (cursor_index == 0 && preedit_string[0] == '\0')
     {
-        if (preedit_start_col == MAXCOL)
-            xim_has_preediting = FALSE;
+        xim_has_preediting = FALSE;
 
         /* If at the start position (after typing backspace)
          * preedit_start_col must be reset. */
@@ -3850 +3861 @@
 
     if (preedit_string != NULL && attr_list != NULL)
     {
-        int index;
+        int idx;
 
         /* Get the byte index as used by PangoAttrIterator */
-        for (index = 0; col > 0 && preedit_string[index] != '\0'; --col)
-            index += utfc_ptr2len((char_u *)preedit_string + index);
+        for (idx = 0; col > 0 && preedit_string[idx] != '\0'; --col)
+            idx += utfc_ptr2len((char_u *)preedit_string + idx);
 
-        if (preedit_string[index] != '\0')
+        if (preedit_string[idx] != '\0')
         {
             PangoAttrIterator   *iter;
             int                 start, end;
@@ -3869 +3880 @@
             {
                 pango_attr_iterator_range(iter, &start, &end);
 
-                if (index >= start && index < end)
+                if (idx >= start && idx < end)
                     char_attr |= translate_pango_attributes(iter);
             }
             while (pango_attr_iterator_next(iter));

src/memline.c

@@ -215 +215 @@
 #define ML_FLUSH        0x02        /* flush locked block */
 #define ML_SIMPLE(x)    (x & 0x10)  /* DEL, INS or FIND */
 
-static void ml_upd_block0 __ARGS((buf_T *buf, int setfname));
+static void ml_upd_block0 __ARGS((buf_T *buf, int set_fname));
 static void set_b0_fname __ARGS((ZERO_BL *, buf_T *buf));
 static void set_b0_dir_flag __ARGS((ZERO_BL *b0p, buf_T *buf));
 #ifdef FEAT_MBYTE
@@ -679 +679 @@
  * Update the timestamp or the B0_SAME_DIR flag of the .swp file.
  */
     static void
-ml_upd_block0(buf, setfname)
+ml_upd_block0(buf, set_fname)
     buf_T       *buf;
-    int         setfname;
+    int         set_fname;
 {
     memfile_T   *mfp;
     bhdr_T      *hp;
@@ -695 +695 @@
         EMSG(_("E304: ml_upd_block0(): Didn't get block 0??"));
     else
     {
-        if (setfname)
+        if (set_fname)
             set_b0_fname(b0p, buf);
         else
             set_b0_dir_flag(b0p, buf);

src/menu.c

@@ -511 +511 @@
          * name (without mnemonic and accelerator text). */
         next_name = menu_name_skip(name);
         dname = menu_text(name, NULL, NULL);
+        if (dname == NULL)
+            goto erret;
+        if (*dname == NUL)
+        {
+            /* Only a mnemonic or accelerator is not valid. */
+            EMSG(_("E792: Empty menu name"));
+            goto erret;
+        }
 
         /* See if it's already there */
         lower_pri = menup;
@@ -704 +712 @@
         parent = menu;
         name = next_name;
         vim_free(dname);
+        dname = NULL;
         if (pri_tab[pri_idx + 1] != -1)
             ++pri_idx;
     }
@@ -793 +802 @@
 erret:
     vim_free(path_name);
     vim_free(dname);
+
+    /* Delete any empty submenu we added before discovering the error.  Repeat
+     * for higher levels. */
+    while (parent != NULL && parent->children == NULL)
+    {
+        if (parent->parent == NULL)
+            menup = &root_menu;
+        else
+            menup = &parent->parent->children;
+        for ( ; *menup != NULL && *menup != parent; menup = &((*menup)->next))
+            ;
+        if (*menup == NULL) /* safety check */
+            break;
+        parent = parent->parent;
+        free_menu(menup);
+    }
     return FAIL;
 }
 
@@ -1753 +1778 @@
 }
 
 /*
+ * Check that a pointer appears in the menu tree.  Used to protect from using
+ * a menu that was deleted after it was selected but before the event was
+ * handled.
+ * Return OK or FAIL.  Used recursively.
+ */
+    int
+check_menu_pointer(root, menu_to_check)
+    vimmenu_T *root;
+    vimmenu_T *menu_to_check;
+{
+    vimmenu_T   *p;
+
+    for (p = root; p != NULL; p = p->next)
+        if (p == menu_to_check
+                || (p->children != NULL
+                    && check_menu_pointer(p->children, menu_to_check) == OK))
+            return OK;
+    return FAIL;
+}
+
+/*
  * After we have started the GUI, then we can create any menus that have been
  * defined.  This is done once here.  add_menu_path() may have already been
  * called to define these menus, and may be called again.  This function calls

src/message.c

@@ -1925 +1925 @@
              * If screen is completely filled and 'more' is set then wait
              * for a character.
              */
-            if (p_more && --lines_left == 0 && State != HITRETURN
+            --lines_left;
+            if (p_more && lines_left == 0 && State != HITRETURN
                                             && !msg_no_more && !exmode_active)
             {
 #ifdef FEAT_CON_DIALOG
@@ -4175 +4176 @@
                         str_arg_l = 0;
                     else
                     {
-                        /* memchr on HP does not like n > 2^31  !!! */
-                        char *q = memchr(str_arg, '\0',
+                        /* Don't put the #if inside memchr(), it can be a
+                         * macro. */
 #if SIZEOF_INT <= 2
-                                precision
+                        char *q = memchr(str_arg, '\0', precision);
 #else
-                                precision <= (size_t)0x7fffffffL ? precision
-                                                       : (size_t)0x7fffffffL
+                        /* memchr on HP does not like n > 2^31  !!! */
+                        char *q = memchr(str_arg, '\0',
+                                  precision <= (size_t)0x7fffffffL ? precision
+                                                       : (size_t)0x7fffffffL);
 #endif
-                                                       );
                         str_arg_l = (q == NULL) ? precision : q - str_arg;
                     }
                     break;

src/misc1.c

@@ -3016 +3016 @@
     int         len = 0;
     int         n;
     int         save_mapped_ctrl_c = mapped_ctrl_c;
+    int         waited = 0;
 
     mapped_ctrl_c = FALSE;      /* mappings are not used here */
     for (;;)
@@ -3034 +3035 @@
             /* Replace zero and CSI by a special key code. */
             n = fix_input_buffer(buf + len, n, FALSE);
             len += n;
+            waited = 0;
         }
+        else if (len > 0)
+            ++waited;       /* keep track of the waiting time */
 
-        /* incomplete termcode: get more characters */
-        if ((n = check_termcode(1, buf, len)) < 0)
+        /* Incomplete termcode and not timed out yet: get more characters */
+        if ((n = check_termcode(1, buf, len)) < 0
+               && (!p_ttimeout || waited * 100L < (p_ttm < 0 ? p_tm : p_ttm)))
             continue;
+
         /* found a termcode: adjust length */
         if (n > 0)
             len = n;
@@ -3196 +3202 @@
     else
         MSG_PUTS(_("Choice number (<Enter> cancels): "));
 
-    /* Set the state such that text can be selected/copied/pasted. */
+    /* Set the state such that text can be selected/copied/pasted and we still
+     * get mouse events. */
     save_cmdline_row = cmdline_row;
-    cmdline_row = Rows - 1;
+    cmdline_row = 0;
     save_State = State;
-    if (mouse_used == NULL)
-        State = CMDLINE;
-    else
-        State = NORMAL;
+    State = CMDLINE;
 
     i = get_number(TRUE, mouse_used);
     if (KeyTyped)
@@ -4492 +4496 @@
                 int l = mb_ptr2len(s);
 
                 while (--l > 0)
-                    *d++ = *s++;
+                    *d++ = *++s;
             }
 # endif
         }

src/netbeans.c

@@ -103 +103 @@
 static int  inputHandler = -1;          /* simply ret.value of WSAAsyncSelect() */
 extern HWND s_hwnd;                     /* Gvim's Window handle */
 #endif
-static int cmdno;                       /* current command number for reply */
+static int r_cmdno;                     /* current command number for reply */
 static int haveConnection = FALSE;      /* socket is connected and
                                            initialization is done */
 #ifdef FEAT_GUI_MOTIF
@@ -832 +832 @@
         return;
     }
 
-    cmdno = strtol(q, &q, 10);
+    r_cmdno = strtol(q, &q, 10);
 
     q = (char *)skipwhite((char_u *)q);
 
-    if (nb_do_cmd(bufno, (char_u *)verb, isfunc, cmdno, (char_u *)q) == FAIL)
+    if (nb_do_cmd(bufno, (char_u *)verb, isfunc, r_cmdno, (char_u *)q) == FAIL)
     {
 #ifdef NBDEBUG
         /*
@@ -1008 +1008 @@
         if (netbeansForcedQuit)
         {
             /* mark as unmodified so NetBeans won't put up dialog on "killed" */
-            sprintf(buf, "%d:unmodified=%d\n", i, cmdno);
+            sprintf(buf, "%d:unmodified=%d\n", i, r_cmdno);
             nbdebug(("EVT: %s", buf));
             nb_send(buf, "netbeans_end");
         }
-        sprintf(buf, "%d:killed=%d\n", i, cmdno);
+        sprintf(buf, "%d:killed=%d\n", i, r_cmdno);
         nbdebug(("EVT: %s", buf));
 /*      nb_send(buf, "netbeans_end");    avoid "write failed" messages */
         if (sd >= 0)
@@ -1986 +1986 @@
             if (buf->bufp != NULL)
                 do_buffer(DOBUF_WIPE, DOBUF_FIRST, FORWARD,
                                                      buf->bufp->b_fnum, TRUE);
+            buf->bufp = NULL;
+            buf->initDone = FALSE;
             doupdate = 1;
 /* =====================================================================*/
         }
@@ -2561 +2563 @@
             if (p != NULL)
             {
                 vim_snprintf(buf, sizeof(buf),
-                                       "0:balloonText=%d \"%s\"\n", cmdno, p);
+                                       "0:balloonText=%d \"%s\"\n", r_cmdno, p);
                 vim_free(p);
             }
             nbdebug(("EVT: %s", buf));
@@ -2615 +2617 @@
 
     if (haveConnection)
     {
-        sprintf(buf, "0:disconnect=%d\n", cmdno);
+        sprintf(buf, "0:disconnect=%d\n", r_cmdno);
         nbdebug(("EVT: %s", buf));
         nb_send(buf, "netbeans_disconnect");
     }
@@ -2634 +2636 @@
         return;
 
     sprintf(buf, "0:geometry=%d %d %d %d %d\n",
-                    cmdno, (int)Columns, (int)Rows, new_x, new_y);
+                    r_cmdno, (int)Columns, (int)Rows, new_x, new_y);
     /*nbdebug(("EVT: %s", buf)); happens too many times during a move */
     nb_send(buf, "netbeans_frame_moved");
 }
@@ -2743 +2745 @@
     if (bufno <= 0)
         return;
 
-    sprintf(buffer, "%d:killed=%d\n", bufno, cmdno);
+    sprintf(buffer, "%d:killed=%d\n", bufno, r_cmdno);
 
     nbdebug(("EVT: %s", buffer));
 
@@ -2817 +2819 @@
     if (p != NULL)
     {
         buf = alloc(128 + 2*newlen);
-        sprintf((char *)buf, "%d:insert=%d %ld \"%s\"\n", bufno, cmdno, off, p);
+        sprintf((char *)buf, "%d:insert=%d %ld \"%s\"\n",
+                                                      bufno, r_cmdno, off, p);
         nbdebug(("EVT: %s", buf));
         nb_send((char *)buf, "netbeans_inserted");
         vim_free(p);
@@ -2859 +2862 @@
 
     off = pos2off(bufp, &pos);
 
-    sprintf((char *)buf, "%d:remove=%d %ld %ld\n", bufno, cmdno, off, len);
+    sprintf((char *)buf, "%d:remove=%d %ld %ld\n", bufno, r_cmdno, off, len);
     nbdebug(("EVT: %s", buf));
     nb_send((char *)buf, "netbeans_removed");
 }
@@ -2884 +2887 @@
 
     nbbuf->modified = 0;
 
-    sprintf((char *)buf, "%d:unmodified=%d\n", bufno, cmdno);
+    sprintf((char *)buf, "%d:unmodified=%d\n", bufno, r_cmdno);
     nbdebug(("EVT: %s", buf));
     nb_send((char *)buf, "netbeans_unmodified");
 #endif
@@ -2908 +2911 @@
         long off = pos2off(curbuf, &curwin->w_cursor);
 
         /* sync the cursor position */
-        sprintf(buf, "%d:newDotAndMark=%d %ld %ld\n", bufno, cmdno, off, off);
+        sprintf(buf, "%d:newDotAndMark=%d %ld %ld\n", bufno, r_cmdno, off, off);
         nbdebug(("EVT: %s", buf));
         nb_send(buf, "netbeans_button_release[newDotAndMark]");
 
-        sprintf(buf, "%d:buttonRelease=%d %d %ld %d\n", bufno, cmdno,
+        sprintf(buf, "%d:buttonRelease=%d %d %ld %d\n", bufno, r_cmdno,
                                     button, (long)curwin->w_cursor.lnum, col);
         nbdebug(("EVT: %s", buf));
         nb_send(buf, "netbeans_button_release");
@@ -2973 +2976 @@
 
     /* sync the cursor position */
     off = pos2off(curbuf, &curwin->w_cursor);
-    sprintf(buf, "%d:newDotAndMark=%d %ld %ld\n", bufno, cmdno, off, off);
+    sprintf(buf, "%d:newDotAndMark=%d %ld %ld\n", bufno, r_cmdno, off, off);
     nbdebug(("EVT: %s", buf));
     nb_send(buf, "netbeans_keycommand");
 
@@ -2984 +2987 @@
 
     /* now send keyCommand event */
     vim_snprintf(buf, sizeof(buf), "%d:keyCommand=%d \"%s\"\n",
-                                                       bufno, cmdno, keyName);
+                                                     bufno, r_cmdno, keyName);
     nbdebug(("EVT: %s", buf));
     nb_send(buf, "netbeans_keycommand");
 
     /* New: do both at once and include the lnum/col. */
     vim_snprintf(buf, sizeof(buf), "%d:keyAtPos=%d \"%s\" %ld %ld/%ld\n",
-            bufno, cmdno, keyName,
+            bufno, r_cmdno, keyName,
                 off, (long)curwin->w_cursor.lnum, (long)curwin->w_cursor.col);
     nbdebug(("EVT: %s", buf));
     nb_send(buf, "netbeans_keycommand");
@@ -3013 +3016 @@
 
     nbbuf->modified = 0;
 
-    sprintf((char *)buf, "%d:save=%d\n", bufno, cmdno);
+    sprintf((char *)buf, "%d:save=%d\n", bufno, r_cmdno);
     nbdebug(("EVT: %s", buf));
     nb_send((char *)buf, "netbeans_save_buffer");
 }
@@ -3037 +3040 @@
     if (nbbuf->insertDone)
         nbbuf->modified = 1;
 
-    sprintf((char *)buf, "%d:remove=%d 0 -1\n", bufno, cmdno);
+    sprintf((char *)buf, "%d:remove=%d 0 -1\n", bufno, r_cmdno);
     nbdebug(("EVT(suppressed): %s", buf));
 /*     nb_send(buf, "netbeans_deleted_all_lines"); */
 }

src/normal.c

@@ -2504 +2504 @@
              * NOTE: Ignore right button down and drag mouse events.
              * Windows only shows the popup menu on the button up event.
              */
-#if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_PHOTON)
+#if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_GTK) \
+                          || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC)
             if (!is_click)
                 return FALSE;
 #endif
@@ -4126 +4127 @@
     int         save_p_ws;
     int         save_p_scs;
     int         retval = OK;
-    int         incl;
+    int         incll;
 
     if ((pat = alloc(len + 7)) == NULL)
         return FAIL;
@@ -4146 +4147 @@
      * With "gd" Search back for the start of the current function, then go
      * back until a blank line.  If this fails go to line 1.
      */
-    if (!locally || !findpar(&incl, BACKWARD, 1L, '{', FALSE))
+    if (!locally || !findpar(&incll, BACKWARD, 1L, '{', FALSE))
     {
         setpcmark();                    /* Set in findpar() otherwise */
         curwin->w_cursor.lnum = 1;

src/ops.c

@@ -2413 +2413 @@
         else
         {
             curwin->w_cursor = oap->end;
+            check_cursor_col();
 
             /* Works just like an 'i'nsert on the next character. */
             if (!lineempty(curwin->w_cursor.lnum)
@@ -3492 +3493 @@
 # endif
         if (flags & PUT_CURSEND)
         {
+            colnr_T len;
+
             curwin->w_cursor = curbuf->b_op_end;
             curwin->w_cursor.col++;
+
+            /* in Insert mode we might be after the NUL, correct for that */
+            len = (colnr_T)STRLEN(ml_get_curline());
+            if (curwin->w_cursor.col > len)
+                curwin->w_cursor.col = len;
         }
         else
             curwin->w_cursor.lnum = lnum;

src/option.c

@@ -2294 +2294 @@
                             {(char_u *)0L, (char_u *)0L}
 #endif
                             },
-    {"spellsuggest", "sps", P_STRING|P_VI_DEF|P_EXPAND|P_SECURE,
+    {"spellsuggest", "sps", P_STRING|P_VI_DEF|P_EXPAND|P_SECURE|P_COMMA,
 #ifdef FEAT_SPELL
                             (char_u *)&p_sps, PV_NONE,
                             {(char_u *)"best", (char_u *)0L}
@@ -5227 +5227 @@
             case PV_STL:        return &curwin->w_p_stl_flags;
 #endif
 #ifdef FEAT_EVAL
+# ifdef FEAT_FOLDING
             case PV_FDE:        return &curwin->w_p_fde_flags;
             case PV_FDT:        return &curwin->w_p_fdt_flags;
+# endif
 # ifdef FEAT_BEVAL
             case PV_BEXPR:      return &curbuf->b_p_bexpr_flags;
 # endif
-#endif
-#if defined(FEAT_EVAL)
 # if defined(FEAT_CINDENT)
             case PV_INDE:       return &curbuf->b_p_inde_flags;
 # endif
@@ -5268 +5268 @@
     char_u      *s;
     char_u      **varp;
     int         both = (opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0;
+    int         idx = opt_idx;
 
-    if (opt_idx == -1)          /* use name */
+    if (idx == -1)              /* use name */
     {
-        opt_idx = findoption(name);
-        if (opt_idx < 0)        /* not found (should not happen) */
+        idx = findoption(name);
+        if (idx < 0)    /* not found (should not happen) */
         {
             EMSG2(_(e_intern2), "set_string_option_direct()");
             return;
         }
     }
 
-    if (options[opt_idx].var == NULL)   /* can't set hidden option */
+    if (options[idx].var == NULL)       /* can't set hidden option */
         return;
 
     s = vim_strsave(val);
     if (s != NULL)
     {
-        varp = (char_u **)get_varp_scope(&(options[opt_idx]),
+        varp = (char_u **)get_varp_scope(&(options[idx]),
                                                both ? OPT_LOCAL : opt_flags);
-        if ((opt_flags & OPT_FREE) && (options[opt_idx].flags & P_ALLOCED))
+        if ((opt_flags & OPT_FREE) && (options[idx].flags & P_ALLOCED))
             free_string_option(*varp);
         *varp = s;
 
         /* For buffer/window local option may also set the global value. */
         if (both)
-            set_string_option_global(opt_idx, varp);
+            set_string_option_global(idx, varp);
 
-        options[opt_idx].flags |= P_ALLOCED;
+        options[idx].flags |= P_ALLOCED;
 
         /* When setting both values of a global option with a local value,
          * make the local value empty, so that the global value is used. */
-        if (((int)options[opt_idx].indir & PV_BOTH) && both)
+        if (((int)options[idx].indir & PV_BOTH) && both)
         {
             free_string_option(*varp);
             *varp = empty_option;
         }
 # ifdef FEAT_EVAL
         if (set_sid != SID_NONE)
-            set_option_scriptID_idx(opt_idx, opt_flags,
+            set_option_scriptID_idx(idx, opt_flags,
                                         set_sid == 0 ? current_SID : set_sid);
 # endif
     }
@@ -6325 +6326 @@
             else
                 errmsg = check_stl_option(p_ruf);
         }
-        else
+        /* check 'statusline' only if it doesn't start with "%!" */
+        else if (varp != &p_stl || s[0] != '%' || s[1] != '!')
             errmsg = check_stl_option(s);
         if (varp == &p_ruf && errmsg == NULL)
             comp_col();
@@ -7324 +7326 @@
 #ifdef FEAT_AUTOCHDIR
     else if ((int *)varp == &p_acd)
     {
-        if (p_acd && curbuf->b_ffname != NULL
-                                     && vim_chdirfile(curbuf->b_ffname) == OK)
-            shorten_fnames(TRUE);
+        /* Change directories when the 'acd' option is set now. */
+        DO_AUTOCHDIR
     }
 #endif
 

src/os_unix.c

@@ -3934 +3934 @@
                     {
                         linenr_T    lnum = curbuf->b_op_start.lnum;
                         int         written = 0;
-                        char_u      *p = ml_get(lnum);
+                        char_u      *lp = ml_get(lnum);
                         char_u      *s;
                         size_t      l;
 
@@ -3942 +3942 @@
                         close(fromshell_fd);
                         for (;;)
                         {
-                            l = STRLEN(p + written);
+                            l = STRLEN(lp + written);
                             if (l == 0)
                                 len = 0;
-                            else if (p[written] == NL)
+                            else if (lp[written] == NL)
                                 /* NL -> NUL translation */
                                 len = write(toshell_fd, "", (size_t)1);
                             else
                             {
-                                s = vim_strchr(p + written, NL);
-                                len = write(toshell_fd, (char *)p + written,
-                                           s == NULL ? l : s - (p + written));
+                                s = vim_strchr(lp + written, NL);
+                                len = write(toshell_fd, (char *)lp + written,
+                                           s == NULL ? l : s - (lp + written));
                             }
                             if (len == l)
                             {
@@ -3973 +3973 @@
                                     toshell_fd = -1;
                                     break;
                                 }
-                                p = ml_get(lnum);
+                                lp = ml_get(lnum);
                                 written = 0;
                             }
                             else if (len > 0)
@@ -4971 +4971 @@
                     if (((*file)[*num_file] = alloc(len + 2)) != NULL)
                     {
                         STRCPY((*file)[*num_file], p);
-                        if (!after_pathsep((*file)[*num_file] + len))
+                        if (!after_pathsep((*file)[*num_file],
+                                                    (*file)[*num_file] + len))
                         {
                             (*file)[*num_file][len] = psepc;
                             (*file)[*num_file][len + 1] = NUL;
@@ -5757 +5758 @@
     int         retval_int = 0;
     int         success = FALSE;
 
-    /* Get a handle to the DLL module. */
+    /*
+     * Get a handle to the DLL module.
+     */
 # if defined(USE_DLOPEN)
+    /* First clear any error, it's not cleared by the dlopen() call. */
+    (void)dlerror();
+
     hinstLib = dlopen((char *)libname, RTLD_LAZY
 #  ifdef RTLD_LOCAL
             | RTLD_LOCAL

src/popupmnu.c

@@ -552 +552 @@
 {
     pum_array = NULL;
     redraw_all_later(SOME_VALID);
+#ifdef FEAT_WINDOWS
+    redraw_tabline = TRUE;
+#endif
     status_redraw_all();
 }
 

src/proto/buffer.pro

@@ -10 +10 @@
 extern int do_buffer __ARGS((int action, int start, int dir, int count, int forceit));
 extern void set_curbuf __ARGS((buf_T *buf, int action));
 extern void enter_buffer __ARGS((buf_T *buf));
+extern void do_autochdir __ARGS((void));
 extern buf_T *buflist_new __ARGS((char_u *ffname, char_u *sfname, linenr_T lnum, int flags));
 extern void free_buf_options __ARGS((buf_T *buf, int free_p_ff));
 extern int buflist_getfile __ARGS((int n, linenr_T lnum, int options, int forceit));

src/proto/menu.pro

@@ -10 +10 @@
 extern int menu_is_child_of_popup __ARGS((vimmenu_T *menu));
 extern int menu_is_toolbar __ARGS((char_u *name));
 extern int menu_is_separator __ARGS((char_u *name));
+extern int check_menu_pointer __ARGS((vimmenu_T *root, vimmenu_T *menu_to_check));
 extern void gui_create_initial_menus __ARGS((vimmenu_T *menu));
 extern void gui_update_menus __ARGS((int modes));
 extern int gui_is_menu_shortcut __ARGS((int key));

src/proto/undo.pro

@@ -4 +4 @@
 extern int u_savesub __ARGS((linenr_T lnum));
 extern int u_inssub __ARGS((linenr_T lnum));
 extern int u_savedel __ARGS((linenr_T lnum, long nlines));
+extern int undo_allowed __ARGS((void));
 extern void u_undo __ARGS((int count));
 extern void u_redo __ARGS((int count));
 extern void undo_time __ARGS((long step, int sec, int absolute));

src/quickfix.c

@@ -500 +500 @@
         {
             if (tv != NULL)
             {
-                int len;
-
                 if (tv->v_type == VAR_STRING)
                 {
                     /* Get the next line from the supplied string */
@@ -602 +600 @@
                 else
                     type = 0;
                 /*
-                 * Extract error message data from matched line
+                 * Extract error message data from matched line.
+                 * We check for an actual submatch, because "\[" and "\]" in
+                 * the 'errorformat' may cause the wrong submatch to be used.
                  */
                 if ((i = (int)fmt_ptr->addr[0]) > 0)            /* %f */
                 {
-                    int c = *regmatch.endp[i];
+                    int c;
+
+                    if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
+                        continue;
 
                     /* Expand ~/file and $HOME/file to full path. */
+                    c = *regmatch.endp[i];
                     *regmatch.endp[i] = NUL;
                     expand_env(regmatch.startp[i], namebuf, CMDBUFFSIZE);
                     *regmatch.endp[i] = c;
@@ -618 +622 @@
                         continue;
                 }
                 if ((i = (int)fmt_ptr->addr[1]) > 0)            /* %n */
+                {
+                    if (regmatch.startp[i] == NULL)
+                        continue;
                     enr = (int)atol((char *)regmatch.startp[i]);
+                }
                 if ((i = (int)fmt_ptr->addr[2]) > 0)            /* %l */
+                {
+                    if (regmatch.startp[i] == NULL)
+                        continue;
                     lnum = atol((char *)regmatch.startp[i]);
+                }
                 if ((i = (int)fmt_ptr->addr[3]) > 0)            /* %c */
+                {
+                    if (regmatch.startp[i] == NULL)
+                        continue;
                     col = (int)atol((char *)regmatch.startp[i]);
+                }
                 if ((i = (int)fmt_ptr->addr[4]) > 0)            /* %t */
+                {
+                    if (regmatch.startp[i] == NULL)
+                        continue;
                     type = *regmatch.startp[i];
+                }
                 if (fmt_ptr->flags == '+' && !multiscan)        /* %+ */
                     STRCPY(errmsg, IObuff);
                 else if ((i = (int)fmt_ptr->addr[5]) > 0)       /* %m */
                 {
+                    if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
+                        continue;
                     len = (int)(regmatch.endp[i] - regmatch.startp[i]);
                     vim_strncpy(errmsg, regmatch.startp[i], len);
                 }
                 if ((i = (int)fmt_ptr->addr[6]) > 0)            /* %r */
+                {
+                    if (regmatch.startp[i] == NULL)
+                        continue;
                     tail = regmatch.startp[i];
+                }
                 if ((i = (int)fmt_ptr->addr[7]) > 0)            /* %p */
                 {
+                    if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
+                        continue;
                     col = (int)(regmatch.endp[i] - regmatch.startp[i] + 1);
                     if (*((char_u *)regmatch.startp[i]) != TAB)
                         use_viscol = TRUE;
                 }
                 if ((i = (int)fmt_ptr->addr[8]) > 0)            /* %v */
                 {
+                    if (regmatch.startp[i] == NULL)
+                        continue;
                     col = (int)atol((char *)regmatch.startp[i]);
                     use_viscol = TRUE;
                 }
                 if ((i = (int)fmt_ptr->addr[9]) > 0)            /* %s */
                 {
+                    if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
+                        continue;
                     len = (int)(regmatch.endp[i] - regmatch.startp[i]);
                     if (len > CMDBUFFSIZE - 5)
                         len = CMDBUFFSIZE - 5;
@@ -2429 +2461 @@
     qf_info_T   *qi;
 {
     buf_T       *buf;
-#ifdef FEAT_AUTOCMD
     aco_save_T  aco;
-#else
-    buf_T       *save_curbuf;
-#endif
 
     /* Check if a buffer for the quickfix list exists.  Update it. */
     buf = qf_find_buf(qi);
     if (buf != NULL)
     {
-#ifdef FEAT_AUTOCMD
         /* set curwin/curbuf to buf and save a few things */
         aucmd_prepbuf(&aco, buf);
-#else
-        save_curbuf = curbuf;
-        curbuf = buf;
-#endif
 
         qf_fill_buffer(qi);
 
-#ifdef FEAT_AUTOCMD
         /* restore curwin/curbuf and a few other things */
         aucmd_restbuf(&aco);
-#else
-        curbuf = save_curbuf;
-#endif
 
         (void)qf_win_pos_update(qi, 0);
     }
@@ -2943 +2962 @@
 #if defined(FEAT_AUTOCMD) && defined(FEAT_SYN_HL)
     char_u      *save_ei = NULL;
 #endif
-#ifndef FEAT_AUTOCMD
-    buf_T       *save_curbuf;
-#else
     aco_save_T  aco;
+#ifdef FEAT_AUTOCMD
     char_u      *au_name =  NULL;
     int         flags = 0;
     colnr_T     col;
@@ -3167 +3184 @@
                      * need to be done now, in that buffer.  And the modelines
                      * need to be done (again).  But not the window-local
                      * options! */
-#if defined(FEAT_AUTOCMD)
                     aucmd_prepbuf(&aco, buf);
-#else
-                    save_curbuf = curbuf;
-                    curbuf = buf;
-                    curwin->w_buffer = curbuf;
-#endif
 #if defined(FEAT_AUTOCMD) && defined(FEAT_SYN_HL)
                     apply_autocmds(EVENT_FILETYPE, buf->b_p_ft,
                                                      buf->b_fname, TRUE, buf);
 #endif
                     do_modelines(OPT_NOWIN);
-#if defined(FEAT_AUTOCMD)
                     aucmd_restbuf(&aco);
-#else
-                    curbuf = save_curbuf;
-                    curwin->w_buffer = curbuf;
-#endif
                 }
             }
         }
@@ -3285 +3291 @@
 {
     buf_T       *newbuf;
     int         failed = TRUE;
-#ifdef FEAT_AUTOCMD
     aco_save_T  aco;
-#else
-    buf_T       *old_curbuf = curbuf;
-#endif
 
     /* Allocate a buffer without putting it in the buffer list. */
     newbuf = buflist_new(NULL, NULL, (linenr_T)1, BLN_DUMMY);
@@ -3299 +3301 @@
     /* Init the options. */
     buf_copy_options(newbuf, BCO_ENTER | BCO_NOHELP);
 
-#ifdef FEAT_AUTOCMD
     /* set curwin/curbuf to buf and save a few things */
     aucmd_prepbuf(&aco, newbuf);
-#else
-    curbuf = newbuf;
-    curwin->w_buffer = newbuf;
-#endif
 
     /* Need to set the filename for autocommands. */
     (void)setfname(curbuf, fname, NULL, FALSE);
@@ -3336 +3333 @@
         }
     }
 
-#ifdef FEAT_AUTOCMD
     /* restore curwin/curbuf and a few other things */
     aucmd_restbuf(&aco);
-#else
-    curbuf = old_curbuf;
-    curwin->w_buffer = old_curbuf;
-#endif
 
     if (!buf_valid(newbuf))
         return NULL;
@@ -3434 +3426 @@
           || dict_add_nr_str(dict, "col",   (long)qfp->qf_col, NULL) == FAIL
           || dict_add_nr_str(dict, "vcol",  (long)qfp->qf_viscol, NULL) == FAIL
           || dict_add_nr_str(dict, "nr",    (long)qfp->qf_nr, NULL) == FAIL
-          || dict_add_nr_str(dict, "pattern",  0L, qfp->qf_pattern) == FAIL
-          || dict_add_nr_str(dict, "text",  0L, qfp->qf_text) == FAIL
+          || dict_add_nr_str(dict, "pattern",  0L,
+             qfp->qf_pattern == NULL ? (char_u *)"" : qfp->qf_pattern) == FAIL
+          || dict_add_nr_str(dict, "text",  0L,
+                   qfp->qf_text == NULL ? (char_u *)"" : qfp->qf_text) == FAIL
           || dict_add_nr_str(dict, "type",  0L, buf) == FAIL
           || dict_add_nr_str(dict, "valid", (long)qfp->qf_valid, NULL) == FAIL)
             return FAIL;

src/regexp.c

@@ -3912 +3912 @@
                 {
                     colnr_T         start, end;
                     colnr_T         start2, end2;
-                    colnr_T         col;
+                    colnr_T         cols;
 
                     getvvcol(wp, &top, &start, NULL, &end);
                     getvvcol(wp, &bot, &start2, NULL, &end2);
@@ -3922 +3922 @@
                         end = end2;
                     if (top.col == MAXCOL || bot.col == MAXCOL)
                         end = MAXCOL;
-                    col = win_linetabsize(wp,
+                    cols = win_linetabsize(wp,
                                       regline, (colnr_T)(reginput - regline));
-                    if (col < start || col > end - (*p_sel == 'e'))
+                    if (cols < start || cols > end - (*p_sel == 'e'))
                         status = RA_NOMATCH;
                 }
             }
@@ -4253 +4253 @@
             {
                 int     i, len;
                 char_u  *opnd;
-                int     opndc, inpc;
+                int     opndc = 0, inpc;
 
                 opnd = OPERAND(scan);
                 /* Safety check (just in case 'encoding' was changed since

src/screen.c

@@ -2612 +2612 @@
 #ifdef FEAT_LINEBREAK
     int         need_showbreak = FALSE;
 #endif
-#if defined(FEAT_SIGNS) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS))
+#if defined(FEAT_SIGNS) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS)) \
+        || defined(FEAT_SYN_HL) || defined(FEAT_DIFF)
 # define LINE_ATTR
     int         line_attr = 0;          /* atrribute for the whole line */
 #endif
@@ -2626 +2627 @@
     int         prev_c = 0;             /* previous Arabic character */
     int         prev_c1 = 0;            /* first composing char for prev_c */
 #endif
-#if defined(FEAT_DIFF) || defined(LINE_ATTR)
+#if defined(LINE_ATTR)
     int         did_line_attr = 0;
 #endif
 
@@ -4116 +4117 @@
                     --ptr;          /* put it back at the NUL */
                 }
 #endif
-#if defined(FEAT_DIFF) || defined(LINE_ATTR)
+#if defined(LINE_ATTR)
                 else if ((
 # ifdef FEAT_DIFF
-                            diff_hlf != (hlf_T)0
-#  ifdef LINE_ATTR
-                            ||
-#  endif
+                            diff_hlf != (hlf_T)0 ||
 # endif
-# ifdef LINE_ATTR
                             line_attr != 0
-# endif
                         ) && (
 # ifdef FEAT_RIGHTLEFT
                             wp->w_p_rl ? (col >= 0) :
@@ -4237 +4233 @@
          * At end of the text line or just after the last character.
          */
         if (c == NUL
-#if defined(FEAT_DIFF) || defined(LINE_ATTR)
+#if defined(LINE_ATTR)
                 || did_line_attr == 1
 #endif
                 )
@@ -4258 +4254 @@
                                 || prevcol == (long)match_hl[0].startcol
                                 || prevcol == (long)match_hl[1].startcol
                                 || prevcol == (long)match_hl[2].startcol)
-# if defined(FEAT_DIFF) || defined(LINE_ATTR)
+# if defined(LINE_ATTR)
                             && did_line_attr <= 1
 # endif
                            )
@@ -7103 +7099 @@
     tabpage_T       *tp;
 #endif
     static int      entered = FALSE;            /* avoid recursiveness */
-    static int      did_outofmem_msg = FALSE;   /* did outofmem message */
+    static int      done_outofmem_msg = FALSE;  /* did outofmem message */
 
     /*
      * Allocation of the screen buffers is done only when the size changes and
@@ -7133 +7129 @@
         return;
     entered = TRUE;
 
+    /*
+     * Note that the window sizes are updated before reallocating the arrays,
+     * thus we must not redraw here!
+     */
+    ++RedrawingDisabled;
+
     win_new_shellsize();    /* fit the windows in the new sized shell */
 
     comp_col();         /* recompute columns for shown command and ruler */
@@ -7205 +7207 @@
 #endif
             || outofmem)
     {
-        if (ScreenLines != NULL || !did_outofmem_msg)
+        if (ScreenLines != NULL || !done_outofmem_msg)
         {
             /* guess the size */
             do_outofmem_msg((long_u)((Rows + 1) * Columns));
 
             /* Remember we did this to avoid getting outofmem messages over
              * and over again. */
-            did_outofmem_msg = TRUE;
+            done_outofmem_msg = TRUE;
         }
         vim_free(new_ScreenLines);
         new_ScreenLines = NULL;
@@ -7240 +7242 @@
     }
     else
     {
-        did_outofmem_msg = FALSE;
+        done_outofmem_msg = FALSE;
 
         for (new_row = 0; new_row < Rows; ++new_row)
         {
@@ -7367 +7369 @@
 #endif
 
     entered = FALSE;
+    --RedrawingDisabled;
 
 #ifdef FEAT_AUTOCMD
     if (starting == 0)

src/search.c

@@ -1259 +1259 @@
         /*
          * Add character and/or line offset
          */
-        if (!(options & SEARCH_NOOF) || *pat == ';')
+        if (!(options & SEARCH_NOOF) || (pat != NULL && *pat == ';'))
         {
             if (spats[0].off.line)      /* Add the offset to the line number. */
             {
@@ -4826 +4826 @@
 
                 if ((compl_cont_status & CONT_ADDING) && i == compl_length)
                 {
-                    /* get the next line */
                     /* IOSIZE > compl_length, so the STRNCPY works */
                     STRNCPY(IObuff, aux, i);
-                    if (!(     depth < 0
-                            && lnum < end_lnum
-                            && (line = ml_get(++lnum)) != NULL)
-                        && !(   depth >= 0
-                            && !vim_fgets(line = file_line,
-                                                     LSIZE, files[depth].fp)))
+
+                    /* Get the next line: when "depth" < 0  from the current
+                     * buffer, otherwise from the included file.  Jump to
+                     * exit_matched when past the last line. */
+                    if (depth < 0)
+                    {
+                        if (lnum >= end_lnum)
+                            goto exit_matched;
+                        line = ml_get(++lnum);
+                    }
+                    else if (vim_fgets(line = file_line,
+                                                      LSIZE, files[depth].fp))
                         goto exit_matched;
 
                     /* we read a line, set "already" to check this "line" later
@@ -4871 +4876 @@
                         goto exit_matched;
                 }
 
-                add_r = ins_compl_add_infercase(aux, i, FALSE,
+                add_r = ins_compl_add_infercase(aux, i, p_ic,
                         curr_fname == curbuf->b_fname ? NULL : curr_fname,
                         dir, reuse);
                 if (add_r == OK)

src/spell.c

@@ -2043 +2043 @@
     int         len;
 # ifdef FEAT_SYN_HL
     int         has_syntax = syntax_present(wp->w_buffer);
-    int         col;
 # endif
+    int         col;
     int         can_spell;
     char_u      *buf = NULL;
     int         buflen = 0;
@@ -2093 +2093 @@
             capcol = (int)(skipwhite(line) - line);
         else if (curline && wp == curwin)
         {
-            int     col = (int)(skipwhite(line) - line);
-
             /* For spellbadword(): check if first word needs a capital. */
+            col = (int)(skipwhite(line) - line);
             if (check_need_cap(lnum, col))
                 capcol = col;
 
@@ -2108 +2107 @@
          * possible. */
         STRCPY(buf, line);
         if (lnum < wp->w_buffer->b_ml.ml_line_count)
-            spell_cat_line(buf + STRLEN(buf), ml_get(lnum + 1), MAXWLEN);
+            spell_cat_line(buf + STRLEN(buf),
+                          ml_get_buf(wp->w_buffer, lnum + 1, FALSE), MAXWLEN);
 
         p = buf + skip;
         endp = buf + len;
@@ -5060 +5060 @@
     int         do_rep;
     int         do_repsal;
     int         do_sal;
-    int         do_map;
+    int         do_mapline;
     int         found_map = FALSE;
     hashitem_T  *hi;
     int         l;
@@ -5098 +5098 @@
     do_sal = spin->si_sal.ga_len == 0;
 
     /* Only do MAP lines when not done in another .aff file already. */
-    do_map = spin->si_map.ga_len == 0;
+    do_mapline = spin->si_map.ga_len == 0;
 
     /*
      * Allocate and init the afffile_T structure.
@@ -5780 +5780 @@
                         smsg((char_u *)_("Expected MAP count in %s line %d"),
                                                                  fname, lnum);
                 }
-                else if (do_map)
+                else if (do_mapline)
                 {
                     int         c;
 
@@ -7507 +7507 @@
 {
     char_u      *p = p_msm;
     long        start = 0;
-    long        inc = 0;
+    long        incr = 0;
     long        added = 0;
 
     if (!VIM_ISDIGIT(*p))
@@ -7519 +7519 @@
     ++p;
     if (!VIM_ISDIGIT(*p))
         return FAIL;
-    inc = (getdigits(&p) * 102) / (SBLOCKSIZE / 10);
+    incr = (getdigits(&p) * 102) / (SBLOCKSIZE / 10);
     if (*p != ',')
         return FAIL;
     ++p;
@@ -7529 +7529 @@
     if (*p != NUL)
         return FAIL;
 
-    if (start == 0 || inc == 0 || added == 0 || inc > start)
+    if (start == 0 || incr == 0 || added == 0 || incr > start)
         return FAIL;
 
     compress_start = start;
-    compress_inc = inc;
+    compress_inc = incr;
     compress_added = added;
     return OK;
 }
@@ -8291 +8291 @@
  * Returns the number of nodes used.
  */
     static int
-put_node(fd, node, index, regionmask, prefixtree)
+put_node(fd, node, idx, regionmask, prefixtree)
     FILE        *fd;            /* NULL when only counting */
     wordnode_T  *node;
-    int         index;
+    int         idx;
     int         regionmask;
     int         prefixtree;     /* TRUE for PREFIXTREE */
 {
-    int         newindex = index;
+    int         newindex = idx;
     int         siblingcount = 0;
     wordnode_T  *np;
     int         flags;
@@ -8308 +8308 @@
         return 0;
 
     /* Store the index where this node is written. */
-    node->wn_u1.index = index;
+    node->wn_u1.index = idx;
 
     /* Count the number of siblings. */
     for (np = node; np != NULL; np = np->wn_sibling)
@@ -9243 +9243 @@
  * Add "word[len]" to 'spellfile' as a good or bad word.
  */
     void
-spell_add_word(word, len, bad, index, undo)
+spell_add_word(word, len, bad, idx, undo)
     char_u      *word;
     int         len;
     int         bad;
-    int         index;      /* "zG" and "zW": zero, otherwise index in
+    int         idx;        /* "zG" and "zW": zero, otherwise index in
                                'spellfile' */
     int         undo;       /* TRUE for "zug", "zuG", "zuw" and "zuW" */
 {
@@ -9261 +9261 @@
     int         i;
     char_u      *spf;
 
-    if (index == 0)         /* use internal wordlist */
+    if (idx == 0)           /* use internal wordlist */
     {
         if (int_wordlist == NULL)
         {
@@ -9289 +9289 @@
         for (spf = curbuf->b_p_spf, i = 1; *spf != NUL; ++i)
         {
             copy_option_part(&spf, fnamebuf, MAXPATHL, ",");
-            if (i == index)
+            if (i == idx)
                 break;
             if (*spf == NUL)
             {
-                EMSGN(_("E765: 'spellfile' does not have %ld entries"), index);
+                EMSGN(_("E765: 'spellfile' does not have %ld entries"), idx);
                 return;
             }
         }
@@ -10070 +10070 @@
 
         /* List the suggestions. */
         msg_start();
+        msg_row = Rows - 1;     /* for when 'cmdheight' > 1 */
         lines_left = Rows;      /* avoid more prompt */
         vim_snprintf((char *)IObuff, IOSIZE, _("Change \"%.*s\" to:"),
                                                 sug.su_badlen, sug.su_badptr);
@@ -13579 +13580 @@
          * the first "the" to itself. */
         return;
 
-    /* Check if the word is already there.  Also check the length that is
-     * being replaced "thes," -> "these" is a different suggestion from
-     * "thes" -> "these". */
-    stp = &SUG(*gap, 0);
-    for (i = gap->ga_len; --i >= 0; ++stp)
-        if (stp->st_wordlen == goodlen
-                && stp->st_orglen == badlen
-                && STRNCMP(stp->st_word, goodword, goodlen) == 0)
-        {
-            /*
-             * Found it.  Remember the word with the lowest score.
-             */
-            if (stp->st_slang == NULL)
-                stp->st_slang = slang;
+    if (gap->ga_len == 0)
+        i = -1;
+    else
+    {
+        /* Check if the word is already there.  Also check the length that is
+         * being replaced "thes," -> "these" is a different suggestion from
+         * "thes" -> "these". */
+        stp = &SUG(*gap, 0);
+        for (i = gap->ga_len; --i >= 0; ++stp)
+            if (stp->st_wordlen == goodlen
+                    && stp->st_orglen == badlen
+                    && STRNCMP(stp->st_word, goodword, goodlen) == 0)
+            {
+                /*
+                 * Found it.  Remember the word with the lowest score.
+                 */
+                if (stp->st_slang == NULL)
+                    stp->st_slang = slang;
 
-            new_sug.st_score = score;
-            new_sug.st_altscore = altscore;
-            new_sug.st_had_bonus = had_bonus;
+                new_sug.st_score = score;
+                new_sug.st_altscore = altscore;
+                new_sug.st_had_bonus = had_bonus;
+
+                if (stp->st_had_bonus != had_bonus)
+                {
+                    /* Only one of the two had the soundalike score computed.
+                     * Need to do that for the other one now, otherwise the
+                     * scores can't be compared.  This happens because
+                     * suggest_try_change() doesn't compute the soundalike
+                     * word to keep it fast, while some special methods set
+                     * the soundalike score to zero. */
+                    if (had_bonus)
+                        rescore_one(su, stp);
+                    else
+                    {
+                        new_sug.st_word = stp->st_word;
+                        new_sug.st_wordlen = stp->st_wordlen;
+                        new_sug.st_slang = stp->st_slang;
+                        new_sug.st_orglen = badlen;
+                        rescore_one(su, &new_sug);
+                    }
+                }
 
-            if (stp->st_had_bonus != had_bonus)
-            {
-                /* Only one of the two had the soundalike score computed.
-                 * Need to do that for the other one now, otherwise the
-                 * scores can't be compared.  This happens because
-                 * suggest_try_change() doesn't compute the soundalike
-                 * word to keep it fast, while some special methods set
-                 * the soundalike score to zero. */
-                if (had_bonus)
-                    rescore_one(su, stp);
-                else
+                if (stp->st_score > new_sug.st_score)
                 {
-                    new_sug.st_word = stp->st_word;
-                    new_sug.st_wordlen = stp->st_wordlen;
-                    new_sug.st_slang = stp->st_slang;
-                    new_sug.st_orglen = badlen;
-                    rescore_one(su, &new_sug);
+                    stp->st_score = new_sug.st_score;
+                    stp->st_altscore = new_sug.st_altscore;
+                    stp->st_had_bonus = new_sug.st_had_bonus;
                 }
+                break;
             }
-
-            if (stp->st_score > new_sug.st_score)
-            {
-                stp->st_score = new_sug.st_score;
-                stp->st_altscore = new_sug.st_altscore;
-                stp->st_had_bonus = new_sug.st_had_bonus;
-            }
-            break;
-        }
+    }
 
     if (i < 0 && ga_grow(gap, 1) == OK)
     {
@@ -15656 +15662 @@
                     ? MB_STRNICMP(p, pat, STRLEN(pat)) == 0
                     : STRNCMP(p, pat, STRLEN(pat)) == 0)
                 && ins_compl_add_infercase(p, (int)STRLEN(p),
-                                          FALSE, NULL, *dir, 0) == OK)
+                                          p_ic, NULL, *dir, 0) == OK)
         /* if dir was BACKWARD then honor it just once */
         *dir = FORWARD;
 }

src/structs.h

@@ -2213 +2213 @@
 
 /*
  * Struct to save values in before executing autocommands for a buffer that is
- * not the current buffer.
+ * not the current buffer.  Without FEAT_AUTOCMD only "curbuf" is remembered.
  */
 typedef struct
 {
     buf_T       *save_buf;      /* saved curbuf */
+#ifdef FEAT_AUTOCMD
     buf_T       *new_curbuf;    /* buffer to be used */
     win_T       *save_curwin;   /* saved curwin, NULL if it didn't change */
     win_T       *new_curwin;    /* new curwin if save_curwin != NULL */
     pos_T       save_cursor;    /* saved cursor pos of save_curwin */
     linenr_T    save_topline;   /* saved topline of save_curwin */
-#ifdef FEAT_DIFF
+# ifdef FEAT_DIFF
     int         save_topfill;   /* saved topfill of save_curwin */
+# endif
 #endif
 } aco_save_T;
 

src/tag.c

@@ -3787 +3787 @@
 {
     int         num_matches, i, ret;
     char_u      **matches, *p;
+    char_u      *full_fname;
     dict_T      *dict;
     tagptrs_T   tp;
     long        is_static;
@@ -3809 +3810 @@
             if (list_append_dict(list, dict) == FAIL)
                 ret = FAIL;
 
+            full_fname = tag_full_fname(&tp);
             if (add_tag_field(dict, "name", tp.tagname, tp.tagname_end) == FAIL
-                    || add_tag_field(dict, "filename", tp.fname,
-                                                         tp.fname_end) == FAIL
+                    || add_tag_field(dict, "filename", full_fname,
+                                                         NULL) == FAIL
                     || add_tag_field(dict, "cmd", tp.command,
                                                        tp.command_end) == FAIL
                     || add_tag_field(dict, "kind", tp.tagkind,
@@ -3819 +3821 @@
                     || dict_add_nr_str(dict, "static", is_static, NULL) == FAIL)
                 ret = FAIL;
 
+            vim_free(full_fname);
+
             if (tp.command_end != NULL)
             {
                 for (p = tp.command_end + 3;

src/term.c

@@ -4783 +4783 @@
                 return -1;
             current_menu = (vimmenu_T *)val;
             slen += num_bytes;
+
+            /* The menu may have been deleted right after it was used, check
+             * for that. */
+            if (check_menu_pointer(root_menu, current_menu) == FAIL)
+            {
+                key_name[0] = KS_EXTRA;
+                key_name[1] = (int)KE_IGNORE;
+            }
         }
 # endif
 # ifdef FEAT_GUI_TABLINE

src/testdir/test56.in

@@ -3 +3 @@
 STARTTEST
 :so small.vim
 :"
-:set nocp
+:set nocp viminfo+=nviminfo
 :/^start:/+1,/^end:/-1w! Xtest.vim
 :source Xtest.vim
 _x

src/ui.c

@@ -1137 +1137 @@
     int         len;
 #ifdef FEAT_MBYTE
     char_u      *p;
-    int         i;
 #endif
     int         row1 = clip_star.start.lnum;
     int         col1 = clip_star.start.col;
@@ -1218 +1217 @@
 #ifdef FEAT_MBYTE
             if (enc_dbcs != 0)
             {
+                int     i;
+
                 p = ScreenLines + LineOffset[row];
                 for (i = start_col; i < end_col; ++i)
                     if (enc_dbcs == DBCS_JPNU && p[i] == 0x8e)

src/undo.c

@@ -84 +84 @@
 static void u_unch_branch __ARGS((u_header_T *uhp));
 static u_entry_T *u_get_headentry __ARGS((void));
 static void u_getbot __ARGS((void));
-static int undo_allowed __ARGS((void));
 static int u_savecommon __ARGS((linenr_T, linenr_T, linenr_T));
 static void u_doit __ARGS((int count));
 static void u_undoredo __ARGS((int undo));
@@ -196 +195 @@
  * Return TRUE when undo is allowed.  Otherwise give an error message and
  * return FALSE.
  */
-    static int
+    int
 undo_allowed()
 {
     /* Don't allow changes when 'modifiable' is off.  */
@@ -1188 +1187 @@
     int         did_undo;       /* just did an undo */
     int         absolute;       /* used ":undo N" */
 {
-    char        *msg;
+    char        *msgstr;
     u_header_T  *uhp;
     char_u      msgbuf[80];
 
@@ -1206 +1205 @@
 
     u_oldcount -= u_newcount;
     if (u_oldcount == -1)
-        msg = N_("more line");
+        msgstr = N_("more line");
     else if (u_oldcount < 0)
-        msg = N_("more lines");
+        msgstr = N_("more lines");
     else if (u_oldcount == 1)
-        msg = N_("line less");
+        msgstr = N_("line less");
     else if (u_oldcount > 1)
-        msg = N_("fewer lines");
+        msgstr = N_("fewer lines");
     else
     {
         u_oldcount = u_newcount;
         if (u_newcount == 1)
-            msg = N_("change");
+            msgstr = N_("change");
         else
-            msg = N_("changes");
+            msgstr = N_("changes");
     }
 
     if (curbuf->b_u_curhead != NULL)
@@ -1245 +1244 @@
 
     smsg((char_u *)_("%ld %s; %s #%ld  %s"),
             u_oldcount < 0 ? -u_oldcount : u_oldcount,
-            _(msg),
+            _(msgstr),
             did_undo ? _("before") : _("after"),
             uhp == NULL ? 0L : uhp->uh_seq,
             msgbuf);

src/version.c

@@ -667 +667 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    99,
+/**/
+    98,
+/**/
+    97,
+/**/
+    96,
+/**/
+    95,
+/**/
+    94,
+/**/
+    93,
+/**/
+    92,
+/**/
+    91,
+/**/
+    90,
+/**/
+    89,
+/**/
+    88,
+/**/
+    87,
+/**/
+    86,
+/**/
+    85,
+/**/
+    84,
+/**/
+    83,
+/**/
+    82,
+/**/
+    81,
+/**/
+    80,
+/**/
+    79,
+/**/
+    78,
+/**/
+    77,
+/**/
+    76,
+/**/
+    75,
+/**/
+    73,
+/**/
+    72,
+/**/
+    71,
+/**/
+    70,
+/**/
+    69,
+/**/
+    68,
+/**/
+    67,
+/**/
+    66,
+/**/
+    64,
+/**/
+    63,
+/**/
+    62,
+/**/
+    61,
+/**/
+    60,
+/**/
+    59,
+/**/
+    58,
+/**/
+    56,
+/**/
+    55,
+/**/
+    54,
+/**/
+    53,
+/**/
+    52,
+/**/
+    51,
+/**/
+    50,
+/**/
+    49,
+/**/
+    48,
+/**/
+    47,
+/**/
+    46,
+/**/
+    44,
+/**/
+    43,
+/**/
+    42,
+/**/
+    41,
+/**/
+    40,
+/**/
+    39,
+/**/
+    38,
+/**/
+    37,
+/**/
+    36,
+/**/
+    35,
+/**/
+    34,
+/**/
+    33,
+/**/
+    31,
+/**/
+    30,
+/**/
+    29,
+/**/
+    28,
+/**/
+    26,
+/**/
+    25,
+/**/
+    24,
+/**/
+    23,
+/**/
+    22,
+/**/
+    21,
+/**/
+    20,
+/**/
+    19,
+/**/
+    18,
+/**/
+    17,
+/**/
+    16,
+/**/
+    15,
+/**/
+    14,
+/**/
+    13,
+/**/
+    12,
+/**/
+    11,
+/**/
+    10,
+/**/
+    9,
+/**/
+    8,
+/**/
+    7,
+/**/
+    6,
+/**/
+    4,
+/**/
+    3,
+/**/
+    2,
+/**/
+    1,
+/**/
     0
 };
 

src/vim.h

@@ -585 +585 @@
 #define INSERT          0x10    /* Insert mode */
 #define LANGMAP         0x20    /* Language mapping, can be combined with
                                    INSERT and CMDLINE */
-#define MAP_ALL_MODES   0x3f    /* all mode bits used for mapping */
 
 #define REPLACE_FLAG    0x40    /* Replace mode flag */
 #define REPLACE         (REPLACE_FLAG + INSERT)
@@ -605 +604 @@
 #define CONFIRM         0x800   /* ":confirm" prompt */
 #define SELECTMODE      0x1000  /* Select mode, only for mappings */
 
+#define MAP_ALL_MODES   (0x3f | SELECTMODE)     /* all mode bits used for
+                                                 * mapping */
+
 /* directions */
 #define FORWARD                 1
 #define BACKWARD                (-1)
@@ -1118 +1120 @@
     EVENT_FOCUSGAINED,          /* got the focus */
     EVENT_FOCUSLOST,            /* lost the focus to another app */
     EVENT_GUIENTER,             /* after starting the GUI */
+    EVENT_GUIFAILED,            /* after starting the GUI failed */
     EVENT_INSERTCHANGE,         /* when changing Insert/Replace mode */
     EVENT_INSERTENTER,          /* when entering Insert mode */
     EVENT_INSERTLEAVE,          /* when leaving Insert mode */
@@ -1983 +1986 @@
 /* values for vim_handle_signal() that are not a signal */
 #define SIGNAL_BLOCK    -1
 #define SIGNAL_UNBLOCK  -2
-#if !defined(UNIX) && !defined(VMS)
+#if !defined(UNIX) && !defined(VMS) && !defined(OS2)
 # define vim_handle_signal(x) 0
 #endif
 

src/window.c

@@ -340 +340 @@
                 {
                     tabpage_T   *oldtab = curtab;
                     tabpage_T   *newtab;
-                    win_T       *wp = curwin;
 
                     /* First create a new tab with the window, then go back to
                      * the old tab and close the window there. */
+                    wp = curwin;
                     if (win_new_tabpage((int)Prenum) == OK
                                                      && valid_tabpage(oldtab))
                     {
@@ -3954 +3954 @@
     setmouse();                 /* in case jumped to/from help buffer */
 #endif
 
-#ifdef FEAT_AUTOCHDIR
-    /* Change directories when the 'acd' option is set on and after
-     * switching windows. */
-    if (p_acd && curbuf->b_ffname != NULL
-                                     && vim_chdirfile(curbuf->b_ffname) == OK)
-        shorten_fnames(TRUE);
-#endif
+    /* Change directories when the 'acd' option is set. */
+    DO_AUTOCHDIR
 }
 
 #endif /* FEAT_WINDOWS */