updated for version 7.1a

11 files changed, 2429 insertions, 534 deletions

diff --git a/README_unix.txt b/README_unix.txt
index 262ff079ae..c63bb27e97 100644
--- a/README_unix.txt
+++ b/README_unix.txt
@@ -1,4 +1,4 @@
-README_unix.txt for version 7.0 of Vim: Vi IMproved.
+README_unix.txt for version 7.1a of Vim: Vi IMproved.
 
 This file explains the installation of Vim on Unix systems.
 See "README.txt" for general information about Vim.
diff --git a/runtime/doc/usr_31.txt b/runtime/doc/usr_31.txt
index 4c11232183..4a73cde2a6 100644
--- a/runtime/doc/usr_31.txt
+++ b/runtime/doc/usr_31.txt
@@ -1,4 +1,4 @@
-*usr_31.txt*	For Vim version 7.0.  Last change: 2006 Apr 24
+*usr_31.txt*	For Vim version 7.1a.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index fb4a3b4366..1b18b2e0a6 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -1,4 +1,4 @@
-*windows.txt*   For Vim version 7.0.  Last change: 2006 Apr 24
+*windows.txt*   For Vim version 7.1a.  Last change: 2007 Mar 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -200,6 +200,7 @@ window will appear.
 :vert[ical] {cmd}
 		Execute {cmd}.  If it contains a command that splits a window,
 		it will be split vertically.
+		Doesn't work for |:execute| and |:normal|.
 
 :lefta[bove] {cmd}				*:lefta* *:leftabove*
 :abo[veleft] {cmd}				*:abo* *:aboveleft*
@@ -207,6 +208,7 @@ window will appear.
 		it will be opened left (vertical split) or above (horizontal
 		split) the current window.  Overrules 'splitbelow' and
 		'splitright'.
+		Doesn't work for |:execute| and |:normal|.
 
 :rightb[elow] {cmd}				*:rightb* *:rightbelow*
 :bel[owright] {cmd}				*:bel* *:belowright*
@@ -214,6 +216,7 @@ window will appear.
 		it will be opened right (vertical split) or below (horizontal
 		split) the current window.  Overrules 'splitbelow' and
 		'splitright'.
+		Doesn't work for |:execute| and |:normal|.
 
 						*:topleft* *E442*
 :to[pleft] {cmd}
@@ -221,6 +224,7 @@ window will appear.
 		it will appear at the top and occupy the full width of the Vim
 		window.  When the split is vertical the window appears at the
 		far left and occupies the full height of the Vim window.
+		Doesn't work for |:execute| and |:normal|.
 
 						*:botright*
 :bo[tright] {cmd}
@@ -228,6 +232,7 @@ window will appear.
 		it will appear at the bottom and occupy the full width of the
 		Vim window.  When the split is vertical the window appears at
 		the far right and occupies the full height of the Vim window.
+		Doesn't work for |:execute| and |:normal|.
 
 These command modifiers can be combined to make a vertically split window
 occupy the full height.  Example: >
@@ -447,6 +452,8 @@ CTRL-W T	Move the current window to a new tab page.  This fails if
 						*CTRL-W_=*
 CTRL-W =	Make all windows (almost) equally high and wide, but use
 		'winheight' and 'winwidth' for the current window.
+		Windows with 'winfixheight' set keep their height and windows
+		with 'winfixwidth' set keep their width.
 
 :res[ize] -N					*:res* *:resize* *CTRL-W_-*
 CTRL-W -	Decrease current window height by N (default 1).
@@ -1118,7 +1125,7 @@ list of buffers. |unlisted-buffer|
 		of windows opened ('winwidth' if |:vertical| was prepended).
 		Buf/Win Enter/Leave autocommands are not executed for the new
 		windows here, that's only done when they are really entered.
-		When the |:tab| modifier is used new windows are opended in a
+		When the |:tab| modifier is used new windows are opened in a
 		new tab, up to 'tabpagemax'.
 
 Note: All the commands above that start editing another buffer, keep the
diff --git a/runtime/ftplugin/ruby.vim b/runtime/ftplugin/ruby.vim
index 66cfcc7876..630d260c9e 100644
--- a/runtime/ftplugin/ruby.vim
+++ b/runtime/ftplugin/ruby.vim
@@ -4,10 +4,10 @@
 " Info:			$Id$
 " URL:			http://vim-ruby.rubyforge.org
 " Anon CVS:		See above site
-" Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
+" Release Coordinator:  Doug Kearns <dougkearns@gmail.com>
 " ----------------------------------------------------------------------------
 "
-" Original matchit support thanks to Ned Konz.	See his ftplugin/ruby.vim at
+" Original matchit support thanks to Ned Konz.  See his ftplugin/ruby.vim at
 "   http://bike-nomad.com/vim/ruby.vim.
 " ----------------------------------------------------------------------------
 
@@ -20,31 +20,37 @@ let b:did_ftplugin = 1
 let s:cpo_save = &cpo
 set cpo&vim
 
+if has("gui_running") && !has("gui_win32")
+  setlocal keywordprg=ri\ -T
+else
+  setlocal keywordprg=ri
+endif
+
 " Matchit support
 if exists("loaded_matchit") && !exists("b:match_words")
   let b:match_ignorecase = 0
 
  " TODO: improve optional do loops
- let b:match_words =
-    \ '\%(' .
-    \	  '\%(\%(\.\|\:\:\)\s*\|\:\)\@<!\<\%(class\|module\|begin\|def\|case\|for\|do\)\>' .
-    \	'\|' .
-    \	  '\%(\%(^\|\.\.\.\=\|[\,;=([<>~\*/%!&^|+-]\)\s*\)\@<=\%(if\|unless\|until\|while\)\>' .
-    \ '\)' .
-    \ ':' .
-    \ '\%(' .
-    \	  '\%(\%(\.\|\:\:\)\s*\|\:\)\@<!\<\%(else\|elsif\|ensure\|when\)\>' .
-    \	'\|' .
-    \	  '\%(\%(^\|;\)\s*\)\@<=\<rescue\>' .
-    \ '\)' .
-    \ ':' .
-    \ '\%(\%(\.\|\:\:\)\s*\|\:\)\@<!\<end\>' .
-    \ ',{:},\[:\],(:)'
+  let b:match_words =
+	\ '\%(' .
+	\     '\%(\%(\.\|\:\:\)\s*\|\:\)\@<!\<\%(class\|module\|begin\|def\|case\|for\|do\)\>' .
+	\   '\|' .
+	\     '\%(\%(^\|\.\.\.\=\|[{\:\,;([<>~\*/%&^|+-]\|\%(\<[_[\:lower\:]][_[\:alnum\:]]*\)\@<![!=?]\)\s*\)\@<=\%(if\|unless\|while\|until\)\>' .
+	\ '\)' .
+	\ ':' .
+	\ '\%(' .
+	\     '\%(\%(\.\|\:\:\)\s*\|\:\)\@<!\<\%(else\|elsif\|ensure\|when\)\>' .
+	\   '\|' .
+	\     '\%(\%(^\|;\)\s*\)\@<=\<rescue\>' .
+	\ '\)' .
+	\ ':' .
+	\ '\%(\%(\.\|\:\:\)\s*\|\:\)\@<!\<end\>' .
+	\ ',{:},\[:\],(:)'
 
   let b:match_skip =
-     \ "synIDattr(synID(line('.'),col('.'),0),'name') =~ '" .
-     \ "\\<ruby\\%(String\\|StringDelimiter\\|ASCIICode\\|Interpolation\\|" .
-     \ "NoInterpolation\\|Escape\\|Comment\\|Documentation\\)\\>'"
+	\ "synIDattr(synID(line('.'),col('.'),0),'name') =~ '" .
+	\ "\\<ruby\\%(String\\|StringDelimiter\\|ASCIICode\\|Interpolation\\|" .
+	\ "NoInterpolation\\|Escape\\|Comment\\|Documentation\\)\\>'"
 
 endif
 
@@ -54,10 +60,16 @@ setlocal include=^\\s*\\<\\(load\\\|\w*require\\)\\>
 setlocal includeexpr=substitute(substitute(v:fname,'::','/','g'),'$','.rb','')
 setlocal suffixesadd=.rb
 
-if version >= 700
+if exists("&ofu") && has("ruby")
   setlocal omnifunc=rubycomplete#Complete
 endif
 
+" To activate, :set ballooneval
+if has('balloon_eval') && exists('+balloonexpr')
+  setlocal balloonexpr=RubyBalloonexpr()
+endif
+
+
 " TODO:
 "setlocal define=^\\s*def
 
@@ -65,7 +77,10 @@ setlocal comments=:#
 setlocal commentstring=#\ %s
 
 if !exists("s:rubypath")
-  if executable("ruby")
+  if has("ruby") && has("win32")
+    ruby VIM::command( 'let s:rubypath = "%s"' % ($: + begin; require %q{rubygems}; Gem.all_load_paths.sort.uniq; rescue LoadError; []; end).join(%q{,}) )
+    let s:rubypath = '.,' . substitute(s:rubypath, '\%(^\|,\)\.\%(,\|$\)', ',,', '')
+  elseif executable("ruby")
     let s:code = "print ($: + begin; require %q{rubygems}; Gem.all_load_paths.sort.uniq; rescue LoadError; []; end).join(%q{,})"
     if &shellxquote == "'"
       let s:rubypath = system('ruby -e "' . s:code . '"')
@@ -84,21 +99,78 @@ let &l:path = s:rubypath
 
 if has("gui_win32") && !exists("b:browsefilter")
   let b:browsefilter = "Ruby Source Files (*.rb)\t*.rb\n" .
-		     \ "All Files (*.*)\t*.*\n"
+                     \ "All Files (*.*)\t*.*\n"
 endif
 
-let b:undo_ftplugin = "setl fo< inc< inex< sua< def< com< cms< path< "
+let b:undo_ftplugin = "setl fo< inc< inex< sua< def< com< cms< path< kp<"
       \ "| unlet! b:browsefilter b:match_ignorecase b:match_words b:match_skip"
+      \ "| if exists('&ofu') && has('ruby') | setl ofu< | endif"
+      \ "| if has('balloon_eval') && exists('+bexpr') | setl bexpr< | endif"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
+if exists("g:did_ruby_ftplugin_functions")
+  finish
+endif
+let g:did_ruby_ftplugin_functions = 1
+
+function! RubyBalloonexpr()
+  if !exists('s:ri_found')
+    let s:ri_found = executable('ri')
+  endif
+  if s:ri_found
+    let line = getline(v:beval_lnum)
+    let b = matchstr(strpart(line,0,v:beval_col),'\%(\w\|[:.]\)*$')
+    let a = substitute(matchstr(strpart(line,v:beval_col),'^\w*\%([?!]\|\s*=\)\?'),'\s\+','','g')
+    let str = b.a
+    let before = strpart(line,0,v:beval_col-strlen(b))
+    let after  = strpart(line,v:beval_col+strlen(a))
+    if str =~ '^\.'
+      let str = substitute(str,'^\.','#','g')
+      if before =~ '\]\s*$'
+        let str = 'Array'.str
+      elseif before =~ '}\s*$'
+        " False positives from blocks here
+        let str = 'Hash'.str
+      elseif before =~ "[\"'`]\\s*$" || before =~ '\$\d\+\s*$'
+        let str = 'String'.str
+      elseif before =~ '\$\d\+\.\d\+\s*$'
+        let str = 'Float'.str
+      elseif before =~ '\$\d\+\s*$'
+        let str = 'Integer'.str
+      elseif before =~ '/\s*$'
+        let str = 'Regexp'.str
+      else
+        let str = substitute(str,'^#','.','')
+      endif
+    endif
+    let str = substitute(str,'.*\.\s*to_f\s*\.\s*','Float#','')
+    let str = substitute(str,'.*\.\s*to_i\%(nt\)\=\s*\.\s*','Integer#','')
+    let str = substitute(str,'.*\.\s*to_s\%(tr\)\=\s*\.\s*','String#','')
+    let str = substitute(str,'.*\.\s*to_sym\s*\.\s*','Symbol#','')
+    let str = substitute(str,'.*\.\s*to_a\%(ry\)\=\s*\.\s*','Array#','')
+    let str = substitute(str,'.*\.\s*to_proc\s*\.\s*','Proc#','')
+    if str !~ '^\w'
+      return ''
+    endif
+    silent! let res = substitute(system("ri -f simple -T \"".str.'"'),'\n$','','')
+    if res =~ '^Nothing known about' || res =~ '^Bad argument:'
+      return ''
+    endif
+    return res
+  else
+    return ""
+  endif
+endfunction
+
+
 "
 " Instructions for enabling "matchit" support:
 "
 " 1. Look for the latest "matchit" plugin at
 "
-"	  http://www.vim.org/scripts/script.php?script_id=39
+"         http://www.vim.org/scripts/script.php?script_id=39
 "
 "    It is also packaged with Vim, in the $VIMRUNTIME/macros directory.
 "
@@ -109,16 +181,16 @@ unlet s:cpo_save
 " 4. Ensure this file (ftplugin/ruby.vim) is installed.
 "
 " 5. Ensure you have this line in your $HOME/.vimrc:
-"	  filetype plugin on
+"         filetype plugin on
 "
 " 6. Restart Vim and create the matchit documentation:
 "
-"	  :helptags ~/.vim/doc
+"         :helptags ~/.vim/doc
 "
 "    Now you can do ":help matchit", and you should be able to use "%" on Ruby
-"    keywords.	Try ":echo b:match_words" to be sure.
+"    keywords.  Try ":echo b:match_words" to be sure.
 "
-" Thanks to Mark J. Reed for the instructions.	See ":help vimrc" for the
+" Thanks to Mark J. Reed for the instructions.  See ":help vimrc" for the
 " locations of plugin directories, etc., as there are several options, and it
 " differs on Windows.  Email gsinclair@soyabean.com.au if you need help.
 "
diff --git a/runtime/syntax/apache.vim b/runtime/syntax/apache.vim
index d15388a84f..db08ab457f 100644
--- a/runtime/syntax/apache.vim
+++ b/runtime/syntax/apache.vim
@@ -4,9 +4,9 @@
 " Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
 " License: This file can be redistribued and/or modified under the same terms
 "		as Vim itself.
-" Last Change: 2006-04-12
+" Last Change: 2006-12-13
 " URL: http://trific.ath.cx/Ftp/vim/syntax/apache.vim
-" Notes: Last synced with apache-2.2.0, version 1.x is no longer supported
+" Notes: Last synced with apache-2.2.3, version 1.x is no longer supported
 " TODO: see particular FIXME's scattered through the file
 "		make it really linewise?
 "		+ add `display' where appropriate
@@ -94,7 +94,7 @@ syn keyword apacheDeclaration AddAlt AddAltByEncoding AddAltByType AddDescriptio
 syn keyword apacheDeclaration IndexStyleSheet
 syn keyword apacheOption DescriptionWidth FancyIndexing FoldersFirst IconHeight IconsAreLinks IconWidth NameWidth ScanHTMLTitles SuppressColumnSorting SuppressDescription SuppressHTMLPreamble SuppressLastModified SuppressSize TrackModified
 syn keyword apacheOption Ascending Descending Name Date Size Description
-syn keyword apacheOption HTMLTable SupressIcon SupressRules VersionSort XHTML
+syn keyword apacheOption HTMLTable SuppressIcon SuppressRules VersionSort XHTML
 syn keyword apacheOption IgnoreClient IgnoreCase ShowForbidden SuppresRules
 syn keyword apacheDeclaration CacheForceCompletion CacheMaxStreamingBuffer
 syn keyword apacheDeclaration CacheDefaultExpire CacheDisable CacheEnable CacheIgnoreCacheControl CacheIgnoreHeaders CacheIgnoreNoLastMod CacheLastModifiedFactor CacheMaxExpire CacheStoreNoStore CacheStorePrivate
@@ -161,7 +161,7 @@ syn keyword apacheDeclaration RewriteBase RewriteCond RewriteEngine RewriteLock
 syn keyword apacheOption inherit
 syn keyword apacheDeclaration BrowserMatch BrowserMatchNoCase SetEnvIf SetEnvIfNoCase
 syn keyword apacheDeclaration LoadFile LoadModule
-syn keyword apacheDeclaration CheckSpelling
+syn keyword apacheDeclaration CheckSpelling CheckCaseOnly
 syn keyword apacheDeclaration SSLCACertificateFile SSLCACertificatePath SSLCADNRequestFile SSLCADNRequestPath SSLCARevocationFile SSLCARevocationPath SSLCertificateChainFile SSLCertificateFile SSLCertificateKeyFile SSLCipherSuite SSLCryptoDevice SSLEngine SSLHonorCipherOrder SSLMutex SSLOptions SSLPassPhraseDialog SSLProtocol SSLProxyCACertificateFile SSLProxyCACertificatePath SSLProxyCARevocationFile SSLProxyCARevocationPath SSLProxyCipherSuite SSLProxyEngine SSLProxyMachineCertificateFile SSLProxyMachineCertificatePath SSLProxyProtocol SSLProxyVerify SSLProxyVerifyDepth SSLRandomSeed SSLRequire SSLRequireSSL SSLSessionCache SSLSessionCacheTimeout SSLUserName SSLVerifyClient SSLVerifyDepth
 syn match apacheOption "[+-]\?\<\(StdEnvVars\|CompatEnvVars\|ExportCertData\|FakeBasicAuth\|StrictRequire\|OptRenegotiate\)\>"
 syn keyword apacheOption builtin sem
diff --git a/runtime/syntax/django.vim b/runtime/syntax/django.vim
index fc48d2608c..d8250d2aea 100644
--- a/runtime/syntax/django.vim
+++ b/runtime/syntax/django.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	Django template
 " Maintainer:	Dave Hodder <dmh@dmh.org.uk>
-" Last Change:	2006 Mar 23
+" Last Change:	2007 Jan 26
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -13,9 +13,12 @@ endif
 
 syntax case match
 
+" Mark illegal characters
+syn match djangoError "%}\|}}\|#}"
+
 " Django template built-in tags and parameters
 " 'comment' doesn't appear here because it gets special treatment
-syn keyword djangoStatement contained as block endblock by cycle debug else
+syn keyword djangoStatement contained and as block endblock by cycle debug else
 syn keyword djangoStatement contained extends filter endfilter firstof for
 syn keyword djangoStatement contained endfor if endif ifchanged endifchanged
 syn keyword djangoStatement contained ifequal endifequal ifnotequal
@@ -23,7 +26,11 @@ syn keyword djangoStatement contained endifnotequal in include load not now or
 syn keyword djangoStatement contained parsed regroup reversed spaceless
 syn keyword djangoStatement contained endspaceless ssi templatetag openblock
 syn keyword djangoStatement contained closeblock openvariable closevariable
-syn keyword djangoStatement contained widthratio with
+syn keyword djangoStatement contained openbrace closebrace opencomment
+syn keyword djangoStatement contained closecomment widthratio with
+syn keyword djangoStatement contained get_current_language trans noop blocktrans
+syn keyword djangoStatement contained endblocktrans get_available_languages
+syn keyword djangoStatement contained get_current_language_bidi plural
 
 " Django templete built-in filters
 syn keyword djangoFilter contained add addslashes capfirst center cut date
@@ -34,19 +41,28 @@ syn keyword djangoFilter contained floatformat get_digit join length length_is
 syn keyword djangoFilter contained linebreaks linebreaksbr linenumbers ljust
 syn keyword djangoFilter contained lower make_list phone2numeric pluralize
 syn keyword djangoFilter contained pprint random removetags rjust slice slugify
-syn keyword djangoFilter contained stringformat striptags time timesince title
+syn keyword djangoFilter contained stringformat striptags
+syn keyword djangoFilter contained time timesince timeuntil title
 syn keyword djangoFilter contained truncatewords unordered_list upper urlencode
 syn keyword djangoFilter contained urlize urlizetrunc wordcount wordwrap yesno
 
+" Keywords to highlight within comments
+syn keyword djangoTodo contained TODO FIXME XXX
+
 " Django template constants (always surrounded by double quotes)
 syn region djangoArgument contained start=/"/ skip=/\\"/ end=/"/
 
+" Mark illegal characters within tag and variables blocks
+syn match djangoTagError contained "#}\|{{\|[^%]}}\|[<>!=&#]"
+syn match djangoVarError contained "#}\|{%\|%}\|[<>!=&#%]"
+
 " Django template tag and variable blocks
-syn region djangoTagBlock start="{%" end="%}" contains=djangoStatement,djangoFilter,djangoArgument display
-syn region djangoVarBlock start="{{" end="}}" contains=djangoFilter,djangoArgument display
+syn region djangoTagBlock start="{%" end="%}" contains=djangoStatement,djangoFilter,djangoArgument,djangoTagError display
+syn region djangoVarBlock start="{{" end="}}" contains=djangoFilter,djangoArgument,djangoVarError display
 
-" Django template 'comment' tag
-syn region djangoComment start="{%\s*comment\s*%}" end="{%\s*endcomment\s*%}"
+" Django template 'comment' tag and comment block
+syn region djangoComment start="{%\s*comment\s*%}" end="{%\s*endcomment\s*%}" contains=djangoTodo
+syn region djangoComBlock start="{#" end="#}" contains=djangoTodo
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
@@ -64,7 +80,12 @@ if version >= 508 || !exists("did_django_syn_inits")
   HiLink djangoStatement Statement
   HiLink djangoFilter Identifier
   HiLink djangoArgument Constant
+  HiLink djangoTagError Error
+  HiLink djangoVarError Error
+  HiLink djangoError Error
   HiLink djangoComment Comment
+  HiLink djangoComBlock Comment
+  HiLink djangoTodo Todo
 
   delcommand HiLink
 endif
diff --git a/runtime/tutor/tutor b/runtime/tutor/tutor
index 04fe335b83..32aef9445f 100644
--- a/runtime/tutor/tutor
+++ b/runtime/tutor/tutor
@@ -29,7 +29,7 @@
 	     ^
 	     k		    Hint:  The h key is at the left and moves left.
        < h	 l >		   The l key is at the right and moves right.
-	     j			   The j key looks like a down arrow
+	     j			   The j key looks like a down arrow.
 	     v
   1. Move the cursor around the screen until you are comfortable.
 
@@ -38,10 +38,10 @@
 
   3. Using the down key, move to Lesson 1.2.
 
-Note: If you are ever unsure about something you typed, press <ESC> to place
+NOTE: If you are ever unsure about something you typed, press <ESC> to place
       you in Normal mode.  Then retype the command you wanted.
 
-Note: The cursor keys should also work.  But using hjkl you will be able to
+NOTE: The cursor keys should also work.  But using hjkl you will be able to
       move around much faster, once you get used to it.  Really!
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -109,7 +109,7 @@ NOTE: As you go through this tutor, do not try to memorize, learn by usage.
 ---> There is text misng this .
 ---> There is some text missing from this line.
 
-  5. When you are comfortable inserting text move to the summary below.
+  5. When you are comfortable inserting text move to lesson 1.5.
 
 
 
@@ -160,7 +160,7 @@ NOTE: As you go through this tutor, do not try to memorize, learn by usage.
 
   
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       LESSON 1 SUMMARY
+			       Lesson 1 SUMMARY
 
 
   1. The cursor is moved using either the arrow keys or the hjkl keys.
@@ -286,15 +286,15 @@ NOTE:  Pressing just the motion while in Normal mode without an operator will
 
   1. Move the cursor to the first UPPER CASE word in the line marked --->.
 
-  2. Type  2dw  to delete the two UPPER CASE words
+  2. Type  d2w  to delete the two UPPER CASE words
 
   3. Repeat steps 1 and 2 with a different count to delete the consecutive
      UPPER CASE words with one command
 
 --->  this ABC DE line FGHI JK LMN OP of words is Q RS TUV cleaned up.
 
-NOTE:  A count between the operator  d  and the motion works similar to
-       using the motion without an operator.
+
+
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -344,10 +344,10 @@ NOTE:  A count between the operator  d  and the motion works similar to
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       LESSON 2 SUMMARY
+			       Lesson 2 SUMMARY
 
 
-  1. To delete from the cursor upto the next word type:    dw
+  1. To delete from the cursor up to the next word type:    dw
   2. To delete from the cursor to the end of a line type:    d$
   3. To delete a whole line type:    dd
 
@@ -357,7 +357,7 @@ NOTE:  A count between the operator  d  and the motion works similar to
      where:
        operator - is what to do, such as  d  for delete
        [number] - is an optional count to repeat the motion
-       motion   - moves over the text to operator on, such as  w (word),
+       motion   - moves over the text to operate on, such as  w (word),
 		  $ (to the end of line), etc.
 
   6. To move to the start of the line use a zero:  0
@@ -406,7 +406,7 @@ NOTE:  A count between the operator  d  and the motion works similar to
 --->  Whan this lime was tuoed in, someone presswd some wrojg keys!
 --->  When this line was typed in, someone pressed some wrong keys!
 
-  5. Now move on to Lesson 3.2.
+  5. Now move on to Lesson 3.3.
 
 NOTE: Remember that you should be learning by doing, not memorization.
 
@@ -428,8 +428,8 @@ NOTE: Remember that you should be learning by doing, not memorization.
 
   5. Repeat steps 3 and 4 until the first sentence is the same as the second.
 
----> 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.
+---> This lubw has a few wptfd that mrrf changing usf the change operator.
+---> This line has a few words that need changing using the change operator.
 
 Notice that  ce  deletes the word and places you in Insert mode.
 
@@ -439,7 +439,7 @@ Notice that  ce  deletes the word and places you in Insert mode.
 		       Lesson 3.4: MORE CHANGES USING c
 
 
-     ** The change command is used with the same motions as delete. **
+     ** The change operator is used with the same motions as delete. **
 
   1. The change operator works in the same way as delete.  The format is:
 
@@ -459,7 +459,7 @@ Notice that  ce  deletes the word and places you in Insert mode.
 NOTE:  You can use the Backspace key to correct mistakes while typing.
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       LESSON 3 SUMMARY
+			       Lesson 3 SUMMARY
 
 
   1. To put back text that has just been deleted, type   p .  This puts the
@@ -487,14 +487,14 @@ Now go on to the next lesson.
   ** Type CTRL-G to show your location in the file and the file status.
      Type  G  to move to a line in the file. **
 
-  Note: Read this entire lesson before executing any of the steps!!
+  NOTE: Read this entire lesson before executing any of the steps!!
 
   1. Hold down the Ctrl key and press  g .  We call this CTRL-G.
      A message will appear at the bottom of the page with the filename and the
      position in the file.  Remember the line number for Step 3.
 
 NOTE:  You may see the cursor position in the lower right corner of the screen
-       This happens when the 'ruler' option is set (explained in lesson 6).
+       This happens when the 'ruler' option is set (see  :help 'ruler'  )
 
   2. Press  G  to move you to the bottom of the file.
      Type  gg  to move you to the start of the file.
@@ -523,8 +523,8 @@ NOTE:  You may see the cursor position in the lower right corner of the screen
   5. To go back to where you came from press  CTRL-O  (Keep Ctrl down while
      pressing the letter o).  Repeat to go back further.  CTRL-I goes forward.
 
-Note: "errroor" is not the way to spell error;  errroor is an error.
-Note: When the search reaches the end of the file it will continue at the
+--->  "errroor" is not the way to spell error;  errroor is an error.
+NOTE: When the search reaches the end of the file it will continue at the
       start, unless the 'wrapscan' option has been reset.
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -546,7 +546,7 @@ Note: When the search reaches the end of the file it will continue at the
 ---> This ( is a test line with ('s, ['s ] and {'s } in it. ))
 
 
-Note: This is very useful in debugging a program with unmatched parentheses!
+NOTE: This is very useful in debugging a program with unmatched parentheses!
 
 
 
@@ -568,13 +568,13 @@ Note: This is very useful in debugging a program with unmatched parentheses!
 
   4. To change every occurrence of a character string between two lines,
      type   :#,#s/old/new/g    where #,# are the line numbers of the range
-                               of lines where the subsitution is to be done.
+                               of lines where the substitution is to be done.
      Type   :%s/old/new/g      to change every occurrence in the whole file.
      Type   :%s/old/new/gc     to find every occurrence in the whole file,
-     			       with a prompt wether to substitute or not.
+     			       with a prompt whether to substitute or not.
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       LESSON 4 SUMMARY
+			       Lesson 4 SUMMARY
 
 
   1. CTRL-G  displays your location in the file and the file status.
@@ -612,11 +612,11 @@ Note: This is very useful in debugging a program with unmatched parentheses!
      will show you a listing of your directory, just as if you were at the
      shell prompt.  Or use  :!dir  if ls doesn't work.
 
-Note:  It is possible to execute any external command this way, also with
+NOTE:  It is possible to execute any external command this way, also with
        arguments.
 
-Note:  All  :  commands must be finished by hitting <ENTER>
-       From here one we will not always mention it.
+NOTE:  All  :  commands must be finished by hitting <ENTER>
+       From here on we will not always mention it.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -635,7 +635,7 @@ Note:  All  :  commands must be finished by hitting <ENTER>
   4. This saves the whole file (the Vim Tutor) under the name TEST.
      To verify this, type    :!dir  or  :!ls   again to see your directory.
 
-Note: If you were to exit Vim and start it again with  vim TEST , the file
+NOTE: If you were to exit Vim and start it again with  vim TEST , the file
       would be an exact copy of the tutor when you saved it.
 
   5. Now remove the file by typing (MS-DOS):    :!del TEST
@@ -689,7 +689,7 @@ NOTE:  You can also read the output of an external command.  For example,
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       LESSON 5 SUMMARY
+			       Lesson 5 SUMMARY
 
 
   1.  :!command  executes an external command.
@@ -708,7 +708,7 @@ NOTE:  You can also read the output of an external command.  For example,
       cursor position.
 
   5.  :r !dir  reads the output of the dir command and puts it below the
-      cursor position
+      cursor position.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -754,7 +754,7 @@ NOTE:  You can also read the output of an external command.  For example,
 ---> This li will allow you to pract appendi text to a line.
 ---> This line will allow you to practice appending text to a line.
 
-Note:  a, i and A all go to the same Insert mode, the only difference is where
+NOTE:  a, i and A all go to the same Insert mode, the only difference is where
        the characters are inserted.
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -772,7 +772,7 @@ Note:  a, i and A all go to the same Insert mode, the only difference is where
   3. Press <ESC> to leave Replace mode.  Notice that the rest of the line
      remains unmodified.
 
-  5. Repeat the steps to replace the remaining xxx.
+  4. Repeat the steps to replace the remaining xxx.
 
 ---> Adding 123 to xxx gives you xxx.
 ---> Adding 123 to 456 gives you 579.
@@ -784,7 +784,7 @@ NOTE:  Replace mode is like Insert mode, but every typed character deletes an
 			Lesson 6.4: COPY AND PASTE TEXT
 
 
-	  ** use the  y  operator to copy text and  p  to paste it **
+	  ** Use the  y  operator to copy text and  p  to paste it **
 
   1. Go to the line marked with ---> below and place the cursor after "a)".
   
@@ -802,7 +802,7 @@ NOTE:  Replace mode is like Insert mode, but every typed character deletes an
 --->  a) this is the first item.
       b)
 
-  Note: you can also use  y  as an operator;  yw  yanks one word.
+  NOTE: you can also use  y  as an operator;  yw  yanks one word.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			    Lesson 6.5: SET OPTION
 
@@ -823,11 +823,11 @@ NOTE:  Replace mode is like Insert mode, but every typed character deletes an
 
   6. To disable ignoring case enter:  :set noic
 
-Note:  To remove the highlighting of matches enter:   :nohlsearch 
-Note:  If you want to ignore case for just one search command, use  \c
+NOTE:  To remove the highlighting of matches enter:   :nohlsearch 
+NOTE:  If you want to ignore case for just one search command, use  \c
        in the phrase:  /ignore\c  <ENTER>
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       LESSON 6 SUMMARY
+			       Lesson 6 SUMMARY
 
   1. Type  o  to open a line BELOW the cursor and start Insert mode.
      Type  O  to open a line ABOVE the cursor.
@@ -850,7 +850,7 @@ Note:  If you want to ignore case for just one search command, use  \c
   7. Prepend "no" to switch an option off:   :set noic
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		       LESSON 7.1: GETTING HELP
+		       Lesson 7.1: GETTING HELP
 
 
 		      ** Use the on-line help system **
@@ -862,7 +862,7 @@ Note:  If you want to ignore case for just one search command, use  \c
 	- type   :help <ENTER>
 
   Read the text in the help window to find out how the help works.
-  type  CTRL-W CTRL-W   to jump from one window to another
+  Type  CTRL-W CTRL-W   to jump from one window to another.
   Type    :q <ENTER>    to close the help window.
 
   You can find help on just about any subject, by giving an argument to the
@@ -873,7 +873,7 @@ Note:  If you want to ignore case for just one search command, use  \c
 	:help insert-index
 	:help user-manual
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		      LESSON 7.2: CREATE A STARTUP SCRIPT
+		      Lesson 7.2: CREATE A STARTUP SCRIPT
 
 
 			  ** Enable Vim features **
@@ -896,7 +896,7 @@ Note:  If you want to ignore case for just one search command, use  \c
   For more information type  :help vimrc-intro
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			     LESSON 7.3: COMPLETION
+			     Lesson 7.3: COMPLETION
 
 
 	      ** Command line completion with CTRL-D and <TAB> **
@@ -919,7 +919,7 @@ NOTE:  Completion works for many commands.  Just try pressing CTRL-D and
        <TAB>.  It is especially useful for  :help .
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       LESSON 7 SUMMARY
+			       Lesson 7 SUMMARY
 
 
   1. Type  :help  or press <F1> or <Help>  to open a help window.
diff --git a/runtime/tutor/tutor.tr.iso9 b/runtime/tutor/tutor.tr.iso9
new file mode 100644
index 0000000000..759e57d3e9
--- /dev/null
+++ b/runtime/tutor/tutor.tr.iso9
@@ -0,0 +1,813 @@
+===============================================================================
+=    	V I M   T u t o r'a Hoş Geldiniz    -    Sürüm 1.5      =
+===============================================================================
+
+     Vim, bu gibi bir eğitmen ile açıklanması gereken çok fazla komut barındıran,
+     oldukça kuvvetli bir metin düzenleyicidir. Bu eğitmen Vim'i çok amaçlı bir
+     düzenleyici olarak kolaylıkla kullanabileceğiniz yeterli sayıda komutu açıklamak
+     için tasarlanmıştır.
+
+     Eğitmeni tamamlama süresi yapacağınız denemelere bağlı olarak 25-30
+     dakikadır.
+
+     Derslerdeki komutlar bu metini değiştirecektir. Üzerinde çalışmak için
+     bu dosyanın bir kopyasını alın (eğer "vimtutor" uygulamasını çalıştırdıysanız
+     zaten bir kopyasını almış oldunuz).
+
+     Bu eğitmenin, kullanarak öğretmeye ayarlandığını unutmamak önemlidir. Bu şu
+     anlama gelir; komutları öğrenmek için doğru bir şekilde çalıştırmanız gerekir.
+     Eğer sadece yazılanları okursanız komutları unutursunuz.
+
+     Şimdi Shift-Lock tuşlarınızın basılı olmadığına emin olun ve Ders 1.1'in
+     ekranı tamamen doldurması için   j   tuşuna yeterli miktarda basın.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			Ders 1.1:  İMLECİ HAREKET ETTİRMEK
+
+  Ç.N: Tüm derslerde <ENTER> gördüğünüz yerde bu tuşa basmanız gerekir.
+
+   ** İmleci hareket ettirmek için, h,j,k,l tuşlarına gösterildiği gibi basın. **
+   	     ^
+	     k		    İpucu: h tuşu soldadır ve sola hareket eder.
+       < h	 l >		   l tuşu sağdadır ve sağa hareket eder.
+	     j			   j tuşu aşağı yönlü bir ok gibidir.
+	     v
+  1. Yeterli hissedinceye kadar imleci ekranda hareket ettirin.
+
+  2. Aşağı tuşunu  (j)  tekrar edene kadar basılı tutun.
+---> Şimdi, bir sonraki derse nasıl geçeceğinizi biliyorsunuz.
+
+  3. Aşağı tuşunu kullanarak, Ders 1.2'ye geçin.
+  Not:  Eğer yazdığınız bir şeyden emin değilseniz, Normal kipe geçmek için <ESC> tuşuna basın.
+        Daha sonra istediğiniz komutu yeniden yazın.
+  Not:  İmleç tuşları da aynı zamanda işe yararlar ancak   hjkl   tuşlarını kullanmaya alıştığınızda etrafta daha hızlı
+        hareket edersiniz.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		     Ders 1.2: VIM'E GİRİŞ VE VIM'DEN ÇIKIŞ
+
+
+  !! NOT: Aşağıdaki adımları yapmadan önce, bu dersi tamamen okuyun.
+
+  1. <ESC> tuşuna basın (Normal kipte olmayı garantilemek için).
+
+  2. Yazın:			:q! <ENTER>.
+
+---> Bu düzenleyicinin yaptığınız değişiklikleri KAYDETMEDEN kapanmasını sağlar.
+     Eğer yaptıklarınızın kaydedilmesini istiyorsanız şunu yazın:
+				:wq  <ENTER>
+
+  3. Kabuk istemcisini (shell prompt) gördüğünüzde, sizi bu eğitmene getiren
+     komutu yazın. Bu:	vimtutor <ENTER> komutudur.
+     Normalde:	vim tutor <ENTER> komutu kullanılır.
+---> 'vim' vim düzenleyicisine gir anlamına gelir, 'tutor' ise açmak istediğiniz dosyadır.
+
+  4. Eğer bu adımları ezberlediyseniz ve kendinizden eminseniz, 1'den 3'e kadar olan adımları,
+     düzenleyiciden çıkmak ve yeniden girmek için uygulayın.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		     Ders 1.3: METİN DÜZENLEME - SİLME
+
+
+** Normal kipteyken imlecin altındaki karakteri silmek için   x  'e basın.**
+
+  1. İmleci aşağıda işaretlenmiş (-->) satıra götürün.
+
+  2. Hataları düzeltmek için, imleci silinmesi gereken karakterin üzerine getirin
+
+  3. İstenmeyen karakteri silmek için   x   tuşuna basın.
+
+  4. Cümle düzelene kadar 2'den 4'e kadar olan adımları tekrar edin.
+
+--