Update runtime files

25 files changed, 1331 insertions, 903 deletions

diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim
index ac1d26847..e080879bf 100644
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -918,8 +918,8 @@ fun! netrw#Explore(indx,dosplit,style,...)
       NetrwKeepj call netrw#ErrorMsg(s:WARNING,"using Nexplore or <s-down> improperly; see help for netrw-starstar",40)
       if has("clipboard")
 "       call Decho("(netrw#Explore) restore @* and @+",'~'.expand("<slnum>"))
-       sil! let @* = keepregstar
-       sil! let @+ = keepregplus
+       if @* != keepregstar | sil! let @* = keepregstar | endif
+       if @+ != keepregplus | sil! let @+ = keepregplus | endif
       endif
       sil! let @/ = keepregslash
 "      call Dret("netrw#Explore")
@@ -944,8 +944,8 @@ fun! netrw#Explore(indx,dosplit,style,...)
       NetrwKeepj call netrw#ErrorMsg(s:WARNING,"using Pexplore or <s-up> improperly; see help for netrw-starstar",41)
       if has("clipboard")
 "       call Decho("(netrw#Explore) restore @* and @+",'~'.expand("<slnum>"))
-       sil! let @* = keepregstar
-       sil! let @+ = keepregplus
+       if @* != keepregstar | sil! let @* = keepregstar | endif
+       if @+ != keepregplus | sil! let @+ = keepregplus | endif
       endif
       sil! let @/ = keepregslash
 "      call Dret("netrw#Explore")
@@ -1000,8 +1000,8 @@ fun! netrw#Explore(indx,dosplit,style,...)
        if &hls | let keepregslash= s:ExplorePatHls(pattern) | endif
        if has("clipboard")
 "        call Decho("(netrw#Explore) restore @* and @+",'~'.expand("<slnum>"))
-	sil! let @* = keepregstar
-	sil! let @+ = keepregplus
+        if @* != keepregstar | sil! let @* = keepregstar | endif
+        if @+ != keepregplus | sil! let @+ = keepregplus | endif
        endif
        sil! let @/ = keepregslash
 "       call Dret("netrw#Explore : no files matched pattern")
@@ -1037,8 +1037,8 @@ fun! netrw#Explore(indx,dosplit,style,...)
       keepalt NetrwKeepj call netrw#ErrorMsg(s:WARNING,"no files matched",42)
       if has("clipboard")
 "       call Decho("(netrw#Explore) restore @* and @+",'~'.expand("<slnum>"))
-       sil! let @* = keepregstar
-       sil! let @+ = keepregplus
+        if @* != keepregstar | sil! let @* = keepregstar | endif
+        if @+ != keepregplus | sil! let @+ = keepregplus | endif
       endif
       sil! let @/ = keepregslash
 "      call Dret("netrw#Explore : no files matched")
@@ -1086,8 +1086,8 @@ fun! netrw#Explore(indx,dosplit,style,...)
     endif
     if has("clipboard")
 "     call Decho("(netrw#Explore) restore @* and @+",'~'.expand("<slnum>"))
-     sil! let @* = keepregstar
-     sil! let @+ = keepregplus
+      if @* != keepregstar | sil! let @* = keepregstar | endif
+      if @+ != keepregplus | sil! let @+ = keepregplus | endif
     endif
     sil! let @/ = keepregslash
 "    call Dret("netrw#Explore : missing +path_extra")
@@ -1160,8 +1160,8 @@ fun! netrw#Explore(indx,dosplit,style,...)
   let s:netrw_events= 2
   if has("clipboard")
 "   call Decho("(netrw#Explore) restore @* and @+",'~'.expand("<slnum>"))
-   sil! let @* = keepregstar
-   sil! let @+ = keepregplus
+   if @* != keepregstar | sil! let @* = keepregstar | endif
+   if @+ != keepregplus | sil! let @+ = keepregplus | endif
   endif
   sil! let @/ = keepregslash
 "  call Dret("netrw#Explore : @/<".@/.">")
@@ -9602,8 +9602,8 @@ fun! s:NetrwWideListing()
    endwhile
    if has("clipboard")
 "    call Decho("(s:NetrwWideListing) restore @* and @+",'~'.expand("<slnum>"))
-    sil! let @*= keepregstar
-    sil! let @+= keepregplus
+    if @* != keepregstar | sil! let @* = keepregstar | endif
+    if @+ != keepregplus | sil! let @+ = keepregplus | endif
    endif
    exe "sil! NetrwKeepj ".w:netrw_bannercnt.',$s/\s\+$//e'
    NetrwKeepj call histdel("/",-1)
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index ab0e68253..ce14c59fe 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 8.1.  Last change: 2019 Sep 27
+*cmdline.txt*   For Vim version 8.1.  Last change: 2019 Nov 26
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index 59e44dcaa..6ced5156c 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -1,4 +1,4 @@
-*develop.txt*   For Vim version 8.1.  Last change: 2019 Aug 05
+*develop.txt*   For Vim version 8.1.  Last change: 2019 Nov 22
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -195,10 +195,14 @@ problems for existing patches.  Only use them for new and changed code.
 
 Comments ~
 
-Traditionally Vim uses /* comments */.  We intend to keep it that way,
-especially for file and function headers.  For new code or lines of code that
-change, it is allowed to use // comments.  Especially when it comes after
-code:
+Traditionally Vim uses /* comments */.  We intend to keep it that way
+for file and function headers and larger blocks of code, E.g.:
+	/*
+	 * The "foo" argument does something useful.
+	 * Return OK or FAIL.
+	 */
+For new code or lines of code that change, it is preferred to use // comments.
+Especially when it comes after code:
 	int some_var;  // single line comment useful here
 
 Enums ~
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 5936437af..b5460ffe3 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 8.1.  Last change: 2019 Nov 24
+*eval.txt*	For Vim version 8.1.  Last change: 2019 Nov 25
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -7642,16 +7642,17 @@ range({expr} [, {max} [, {stride}]])				*range()*
 
 rand([{expr}])						*rand()*
 		Return a pseudo-random Number generated with an xorshift
-		algorithm using seed {expr}.  {expr} can be initialized by
-		|srand()| and will be updated by rand().
-		If {expr} is omitted, an internal seed value is used and
-		updated.
+		algorithm using seed {expr}.  The returned number is 32 bits,
+		also on 64 bits systems, for consistency.
+		{expr} can be initialized by |srand()| and will be updated by
+		rand().  If {expr} is omitted, an internal seed value is used
+		and updated.
 
 		Examples: >
 			:echo rand()
 			:let seed = srand()
 			:echo rand(seed)
-			:echo rand(seed)
+			:echo rand(seed) % 16  " random number 0 - 15
 <
 							*readdir()*
 readdir({directory} [, {expr}])
@@ -9149,7 +9150,8 @@ sqrt({expr})						*sqrt()*
 srand([{expr}])						*srand()*
 		Initialize seed used by |rand()|:
 		- If {expr} is not given, seed values are initialized by
-		  time(NULL) a.k.a. epoch time.
+		  time(NULL) a.k.a. epoch time.  This only has second
+		  accuracy.
 		- If {expr} is given, return seed values which x element is
 		  {expr}.  This is useful for testing or when a predictable
 		  sequence is expected.
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index b3d757992..f4fc249b1 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 8.1.  Last change: 2019 Nov 10
+*options.txt*	For Vim version 8.1.  Last change: 2019 Nov 26
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1195,7 +1195,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		    (mostly used in |Normal-mode| or |Cmdline-mode|).
 	esc	    hitting <Esc> in |Normal-mode|.
 	ex	    In |Visual-mode|, hitting |Q| results in an error.
-	hangul	    Error occurred when using hangul input.
+	hangul	    Ignored.
 	insertmode  Pressing <Esc> in 'insertmode'.
 	lang	    Calling the beep module for Lua/Mzscheme/TCL.
 	mess	    No output available for |g<|.
@@ -1920,7 +1920,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		    {only works when compiled with the |+textprop| feature}
 
 	   popuphidden
-	   	    Just like "popup" but initially hide the popup.  Use a
+		    Just like "popup" but initially hide the popup.  Use a
 		    |CompleteChanged| autocommand to fetch the info and call
 		    |popup_show()| once the popup has been filled.
 		    See the example at |complete-popuphidden|.
@@ -6574,12 +6574,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 	of this option).
 	The default is ">".  For Unix, if the 'shell' option is "csh" or
 	"tcsh" during initializations, the default becomes ">&".  If the
-	'shell' option is "sh", "ksh", "mksh", "pdksh", "zsh",
-	"zsh-beta","bash" or "fish", the default becomes ">%s 2>&1".  This
-	means that stderr is also included.  For Win32, the Unix checks are
-	done and additionally "cmd" is checked for, which makes the default
-	">%s 2>&1".  Also, the same names with ".exe" appended are checked
-	for.
+	'shell' option is "sh", "ksh", "mksh", "pdksh", "zsh", "zsh-beta",
+	"bash" or "fish", the default becomes ">%s 2>&1".  This means that
+	stderr is also included.  For Win32, the Unix checks are done and
+	additionally "cmd" is checked for, which makes the default ">%s 2>&1".
+	Also, the same names with ".exe" appended are checked for.
 	The initialization of this option is done after reading the ".vimrc"
 	and the other initializations, so that when the 'shell' option is set
 	there, the 'shellredir' option changes automatically unless it was
@@ -7255,7 +7254,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	{ NF  Evaluate expression between '%{' and '}' and substitute result.
 	      Note that there is no '%' before the closing '}'.  The
 	      expression cannot contain a '}' character, call a function to
-	      work around that.
+	      work around that.  See |stl-%{| below.
 	( -   Start of item group.  Can be used for setting the width and
 	      alignment of a section.  Must be followed by %) somewhere.
 	) -   End of item group.  No width fields allowed.
@@ -7289,13 +7288,13 @@ A jump table for the options with a short description can be found at |Q_op|.
 		:set statusline=...%(\ [%M%R%H]%)...
 <	Beware that an expression is evaluated each and every time the status
 	line is displayed.
-					*g:actual_curbuf* *g:actual_curwin*
-	The current buffer and current window will be set temporarily to that
-	of the window (and buffer) whose statusline is currently being drawn.
-	The expression will evaluate in this context.  The variable
-	"g:actual_curbuf" is set to the `bufnr()` number of the real current
-	buffer and "g:actual_curwin" to the |window-ID| of the real current
-	window.  These values are strings.
+				*stl-%{* *g:actual_curbuf* *g:actual_curwin*
+	While evaluationg %{} the current buffer and current window will be
+	set temporarily to that of the window (and buffer) whose statusline is
+	currently being drawn.  The expression will evaluate in this context.
+	The variable "g:actual_curbuf" is set to the `bufnr()` number of the
+	real current buffer and "g:actual_curwin" to the |window-ID| of the
+	real current window.  These values are strings.
 
 	The 'statusline' option will be evaluated in the |sandbox| if set from
 	a modeline, see |sandbox-option|.
@@ -8951,6 +8950,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	fail (and make sure not to exit Vim until the write was successful).
 	See |backup-table| for another explanation.
 	When the 'backupskip' pattern matches, a backup is not made anyway.
+	Depending on 'backupcopy' the backup is a new file or the original
+	file renamed (and a new file is written).
 	NOTE: This option is set to the default value when 'compatible' is
 	set.
 
diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt
index 093519e28..972b43c19 100644
--- a/runtime/doc/sign.txt
+++ b/runtime/doc/sign.txt
@@ -373,7 +373,7 @@ sign_define({list})
 
 		The one argument {list} can be used to define a list of signs.
 		Each list item is a dictionary with the above items in {dict}
-		and a 'name' item for the sign name.
+		and a "name" item for the sign name.
 
 		Returns 0 on success and -1 on failure.  When the one argument
 		{list} is used, then returns a List of values one for each
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 2d1826315..3ec4acf1c 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 8.1.  Last change: 2019 Nov 14
+*syntax.txt*	For Vim version 8.1.  Last change: 2019 Nov 20
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -2771,10 +2771,10 @@ To set a user-defined list of code block syntax highlighting: >
 To assign multiple code block types to a single syntax, define
 `rst_syntax_code_list` as a mapping: >
 	let rst_syntax_code_list = {
-		\ 'cpp' = ['cpp', 'c++'],
-                \ 'bash' = ['bash', 'sh'],
+		\ 'cpp': ['cpp', 'c++'],
+		\ 'bash': ['bash', 'sh'],
 		...
-	}
+	\ }
 
 To use color highlighting for emphasis text: >
 	let rst_use_emphasis_colors = 1
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 3bbdc0663..15c37fccf 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -5557,6 +5557,8 @@ c_CTRL-R_CTRL-O	cmdline.txt	/*c_CTRL-R_CTRL-O*
 c_CTRL-R_CTRL-P	cmdline.txt	/*c_CTRL-R_CTRL-P*
 c_CTRL-R_CTRL-R	cmdline.txt	/*c_CTRL-R_CTRL-R*
 c_CTRL-R_CTRL-W	cmdline.txt	/*c_CTRL-R_CTRL-W*
+c_CTRL-SHIFT-Q	cmdline.txt	/*c_CTRL-SHIFT-Q*
+c_CTRL-SHIFT-V	cmdline.txt	/*c_CTRL-SHIFT-V*
 c_CTRL-T	cmdline.txt	/*c_CTRL-T*
 c_CTRL-U	cmdline.txt	/*c_CTRL-U*
 c_CTRL-V	cmdline.txt	/*c_CTRL-V*
@@ -7253,6 +7255,7 @@ i_CTRL-R_=	insert.txt	/*i_CTRL-R_=*
 i_CTRL-R_CTRL-O	insert.txt	/*i_CTRL-R_CTRL-O*
 i_CTRL-R_CTRL-P	insert.txt	/*i_CTRL-R_CTRL-P*
 i_CTRL-R_CTRL-R	insert.txt	/*i_CTRL-R_CTRL-R*
+i_CTRL-SHIFT-V	insert.txt	/*i_CTRL-SHIFT-V*
 i_CTRL-T	insert.txt	/*i_CTRL-T*
 i_CTRL-U	insert.txt	/*i_CTRL-U*
 i_CTRL-V	insert.txt	/*i_CTRL-V*
@@ -7382,6 +7385,7 @@ interfaces-5.2	version5.txt	/*interfaces-5.2*
 internal-variables	eval.txt	/*internal-variables*
 internal-wordlist	spell.txt	/*internal-wordlist*
 internet	intro.txt	/*internet*
+interrupt()	eval.txt	/*interrupt()*
 intro	intro.txt	/*intro*
 intro.txt	intro.txt	/*intro.txt*
 inverse	syntax.txt	/*inverse*
@@ -8517,6 +8521,7 @@ quotestar	gui.txt	/*quotestar*
 quote~	change.txt	/*quote~*
 r	change.txt	/*r*
 r.vim	syntax.txt	/*r.vim*
+rand()	eval.txt	/*rand()*
 range()	eval.txt	/*range()*
 raw-terminal-mode	term.txt	/*raw-terminal-mode*
 rcp	pi_netrw.txt	/*rcp*
@@ -8938,6 +8943,7 @@ sqlj	ft_sql.txt	/*sqlj*
 sqlserver	ft_sql.txt	/*sqlserver*
 sqlsettype	ft_sql.txt	/*sqlsettype*
 sqrt()	eval.txt	/*sqrt()*
+srand()	eval.txt	/*srand()*
 sscanf	eval.txt	/*sscanf*
 standard-plugin	usr_05.txt	/*standard-plugin*
 standard-plugin-list	help.txt	/*standard-plugin-list*
@@ -8957,6 +8963,7 @@ state()	eval.txt	/*state()*
 static-tag	tagsrch.txt	/*static-tag*
 status-line	windows.txt	/*status-line*
 statusmsg-variable	eval.txt	/*statusmsg-variable*
+stl-%{	options.txt	/*stl-%{*
 str2float()	eval.txt	/*str2float()*
 str2list()	eval.txt	/*str2list()*
 str2nr()	eval.txt	/*str2nr()*
@@ -8977,6 +8984,7 @@ string-match	eval.txt	/*string-match*
 strlen()	eval.txt	/*strlen()*
 strpart()	eval.txt	/*strpart()*
 strpbrk()	eval.txt	/*strpbrk()*
+strptime()	eval.txt	/*strptime()*
 strrchr()	eval.txt	/*strrchr()*
 strridx()	eval.txt	/*strridx()*
 strspn()	eval.txt	/*strspn()*
diff --git a/runtime/doc/terminal.txt b/runtime/doc/terminal.txt
index d83035cc7..4dcf2be1b 100644
--- a/runtime/doc/terminal.txt
+++ b/runtime/doc/terminal.txt
@@ -1046,12 +1046,12 @@ file for now, e.g.: >
 
 The test will then fail, giving you the command to compare the reference dump
 and the failed dump, e.g.: >
-	call term_dumpdiff("Test_func.dump.failed", "dumps/Test_func.dump")
+	call term_dumpdiff("failed/Test_func.dump", "dumps/Test_func.dump")
 
 Use this command in Vim, with the current directory set to src/testdir.
 Once you are satisfied with the test, move the failed dump in place of the
 reference: >
-	:!mv Test_func.dump.failed dumps/Test_func.dump
+	:!mv failed/Test_func.dump dumps/Test_func.dump
 
 
 Creating a screen dump ~
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 33e608d58..4efcf135d 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 8.1.  Last change: 2019 Nov 19
+*todo.txt*      For Vim version 8.1.  Last change: 2019 Nov 26
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -38,10 +38,7 @@ browser use: https://github.com/vim/vim/issues/1234
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Patch 2314 for vi' causes a new problem.  #5247
-
-Patch from Namsh to allow building with both XIM and hangulin. (2019 Aug 29)
-
+For rand() use http://prng.di.unimi.it/xoshiro128starstar.c ?
 
 Popup windows:
 - Use popup (or popup menu) for command line completion
@@ -49,7 +46,7 @@ Popup windows:
 - Make redrawing more efficient and avoid flicker:
     - put popup menu also in popup_mask?
 - Any other commands to disable in a popup window?
-  Use ERROR_IF_POPUP_WINDOW for more commands.
+  Use ERROR_IF_POPUP_WINDOW for these.
 - Figure out the size and position better.
     if wrapping splits a double-wide character
     if wrapping inserts indent
@@ -62,8 +59,6 @@ Text properties:
 - See remarks at top of src/textprop.c
 
 'incsearch' with :s: 
-- Get E20 when using command history to get "'<,'>s/a/b" and no Visual area
-  was set. (issue #3837)
 - :s/foo  using CTRL-G moves to another line, should not happen, or use the
   correct line (it uses the last but one line) (Lifepillar, Aug 18, #3345)
 - :s@pat/tern@ doesn't include "/" in the pattern. (Takahiro Yoshihara, #3637)
@@ -137,20 +132,14 @@ Motif: Build on Ubuntu can't enter any text in dialog text fields.
 Patch to properly break CJK lines: Anton Kochkov, #3875
 Flag in 'formatoptions' is not used in the tests.
 
-Remove check for cmd_silent when calling search_stat()? (Gary Johnson)
-
 undo result wrong: Masato Nishihata, #4798
 
 Undo puts cursor in wrong line after "cG<Esc>" undo.
 
 Sound: support on Mac?  Or does libcanberra work there?
 
-Patch to user manual: #5098.  Comments by DC Slagel:
-- semicolon use should be OK.
-- Keep capital after colon.
-
-Patch to fix session file when using multiple tabs. (Jason Franklin, 2019 May
-20)
+Patch to fix session file when using multiple tab pages. (Jason Franklin, 2019
+May 20)
 Also put :argadd commands at the start for all buffers, so that their order
 remains equal?  Then %argdel to clean it up.  Do try this with 'hidden' set.
 Also #4994: window-local options not always restored, related to using :badd.
@@ -198,15 +187,9 @@ with packages under "start". (xtal8, #1994)
 Modeless selection doesn't work in gvim. (#4783)
 Caused by patch 8.1.1534.
 
-Patch to add random number generator. (Hong Xu, 2010 Nov 8, update Nov 10)
-Alternative from Christian Brabandt. (2010 Sep 19)
-New one from Yasuhiro Matsumoto, #1277.
-
 Visual highlight not removed when 'dipslay' is "lastline" and line doesn't
 fit. (Kevin Lawler, #4457)
 
-Patch to add interrupt(). (Yasuhiro Matsumoto, #2834)
-
 Patch to add per-tabpage and per-window previous directory: "lcd -" and "tcd
 -". (Yegappan Lakshmanan, #4362)
 
@@ -239,7 +222,7 @@ Add a WindowScrolled event.  Trigger around the same time as CursorMoved.
 Can be used to update highlighting. #3127  #5181
 
 Patch for Template string: #4491.  New pull: #4634
-Have another look at the implementation: Is the code worth it?
+Implementation is too inefficient, avoid using lambda.
 
 Incorrect formatting with autoindent. (Sebastian Gniazdowski, #4909)
 
@@ -559,9 +542,6 @@ How would we know that the status line needs to be updated?
 
 Adjust windows installer explanation of behavior. (scootergrisen, #3310)
 
-Set g:actual_curbuf when evaluating 'statusline', not just with an expression.
-(Daniel Hahler, 2018 Aug 8, #3299)
-
 Update for xim-input-style help (Tony Mechelynck, 2019 Jan 10).
 Feedback from someone who uses this?
 
diff --git a/runtime/doc/usr_01.txt b/runtime/doc/usr_01.txt
index f7abd9cf4..49bf4f594 100644
--- a/runtime/doc/usr_01.txt
+++ b/runtime/doc/usr_01.txt
@@ -1,4 +1,4 @@
-*usr_01.txt*	For Vim version 8.1.  Last change: 2017 Jul 15
+*usr_01.txt*	For Vim version 8.1.  Last change: 2019 Nov 21
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -41,11 +41,11 @@ the commands and options used for it.  Use these two commands:
 	Press  CTRL-O  to jump back (repeat to go further back).
 
 Many links are in vertical bars, like this: |bars|.  The bars themselves may
-be hidden or invisible, see below.  An option name, like 'number', a command
+be hidden or invisible; see below.  An option name, like 'number', a command
 in double quotes like ":write" and any other word can also be used as a link.
 Try it out: Move the cursor to  CTRL-]  and press CTRL-] on it.
 
-Other subjects can be found with the ":help" command, see |help.txt|.
+Other subjects can be found with the ":help" command; see |help.txt|.
 
 The bars and stars are usually hidden with the |conceal| feature.  They also
 use |hl-Ignore|, using the same color for the text as the background.  You can
@@ -101,14 +101,14 @@ For more info see |vimrc| and |compatible-default|.
 	alternative called "evim" (easy Vim).  This is still Vim, but used in
 	a way that resembles a click-and-type editor like Notepad.  It always
 	stays in Insert mode, thus it feels very different.  It is not
-	explained in the user manual, since it should be mostly self
-	explanatory.  See |evim-keys| for details.
+	explained in the user manual, since it should be mostly
+	self-explanatory.  See |evim-keys| for details.
 
 ==============================================================================
 *01.3*	Using the Vim tutor				*tutor* *vimtutor*
 
 Instead of reading the text (boring!) you can use the vimtutor to learn your
-first Vim commands.  This is a 30 minute tutorial that teaches the most basic
+first Vim commands.  This is a 30-minute tutorial that teaches the most basic
 Vim functionality hands-on.
 
 On Unix, if Vim has been properly installed, you can start it from the shell:
diff --git a/runtime/doc/usr_02.txt b/runtime/doc/usr_02.txt
index b9e968e25..8d3ddeee6 100644
--- a/runtime/doc/usr_02.txt
+++ b/runtime/doc/usr_02.txt
@@ -1,4 +1,4 @@
-*usr_02.txt*	For Vim version 8.1.  Last change: 2017 Mar 14
+*usr_02.txt*	For Vim version 8.1.  Last change: 2019 Nov 21
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -255,11 +255,11 @@ restores the character.
 
 	g intelligent turtle ~
 
-The next u command restores the next-to-last character deleted:
+The next "u" command restores the next-to-last character deleted:
 
 	ng intelligent turtle ~
 
-The next u command gives you the u, and so on:
+The next "u" command gives you the u, and so on:
 
 	ung intelligent turtle ~
 	oung intelligent turtle ~
@@ -375,7 +375,7 @@ To exit, use the "ZZ" command.  This command writes the file and exits.
 	Unlike many other editors, Vim does not automatically make a backup
 	file.  If you type "ZZ", your changes are committed and there's no
 	turning back.  You can configure the Vim editor to produce backup
-	files, see |07.4|.
+	files; see |07.4|.
 
 
 DISCARDING CHANGES
@@ -398,7 +398,7 @@ message and refuse to exit:
 	E37: No write since last change (use ! to override) ~
 
 By specifying the override, you are in effect telling Vim, "I know that what
-I'm doing looks stupid, but I'm a big boy and really want to do this."
+I'm doing looks stupid, but I really want to do this."
 
 If you want to continue editing with Vim: The ":e!" command reloads the
 original version of the file.
@@ -551,7 +551,7 @@ Summary: 					*help-summary*  >
    command argument %: >
    	:help c_%
 
-8) Ex-commands always start with ":", so to go to the :s command help: >
+8) Ex-commands always start with ":", so to go to the ":s" command help: >
 	:help :s
 
 9) Commands specifically for debugging start with ">".  To go to the help
@@ -561,22 +561,23 @@ Summary: 					*help-summary*  >
 10) Key combinations.  They usually start with a single letter indicating
     the mode for which they can be used.  E.g.: >
    	:help i_CTRL-X
-<    takes you to the family of Ctrl-X commands for insert mode which can be
-    used to auto complete different things.  Note, that certain keys will
+<    takes you to the family of CTRL-X commands for insert mode which can be
+    used to auto-complete different things.  Note, that certain keys will
     always be written the same, e.g. Control will always be CTRL.
     For normal mode commands there is no prefix and the topic is available at
     :h CTRL-<Letter>. E.g.  >
    	:help CTRL-W
 <    In contrast >
 	:help c_CTRL-R
-<    will describe what the Ctrl-R does when entering commands in the Command
+<    will describe what the CTRL-R does when entering commands in the Command
     line and >
-   	:help v_Ctrl-A
+   	:help v_CTRL-A
 <    talks about incrementing numbers in visual mode and >
 	:help g_CTRL-A
-<    talks about the g<C-A> command (e.g. you have to press "g" then <Ctrl-A>).
-    Here the "g" stand for the normal command "g" which always expects a second
-    key before doing something similar to the commands starting with "z"
+<    talks about the "g<C-A>" command (e.g. you have to press "g" then
+    <CTRL-A>).  Here the "g" stand for the normal command "g" which always
+    expects a second key before doing something similar to the commands
+    starting with "z"
 
 11) Regexp items always start with /.  So to get help for the "\+" quantifier
     in Vim regexes: >
@@ -647,15 +648,16 @@ Summary: 					*help-summary*  >
 <    Also if you want to access a certain chapter in the help, the chapter
     number can be accessed directly like this: >
     	:help 10.1
-<    goes to chapter 10.1 in |usr_10.txt| and talks about recording macros.
+<    which goes to chapter 10.1 in |usr_10.txt| and talks about recording
+    macros.
 
 19) Highlighting groups.  Always start with hl-groupname.  E.g. >
     	:help hl-WarningMsg
 <    talks about the WarningMsg highlighting group.
 
-20) Syntax highlighting is namespaced to :syn-topic e.g. >
+20) Syntax highlighting is namespaced to :syn-topic.  E.g. >
 	:help :syn-conceal
-<    talks about the conceal argument for the :syn command.
+<    talks about the conceal argument for the ":syn" command.
 
 21) Quickfix commands usually start with :c while location list commands
     usually start with :l
@@ -688,7 +690,7 @@ Summary: 					*help-summary*  >
 <    takes you exactly to the description of the swap error message and >
 	:help W10
 <    talks about the warning "Changing a readonly file".
-    Sometimes however, those error codes are not described, but rather are
+    Sometimes, however, those error codes are not described, but rather are
     listed at the Vim command that usually causes this.  So: >
     	:help E128
 <    takes you to the |:function| command
diff --git a/runtime/doc/usr_03.txt b/runtime/doc/usr_03.txt
index 5c204f03f..48f71bff6 100644
--- a/runtime/doc/usr_03.txt
+++ b/runtime/doc/usr_03.txt
@@ -1,4 +1,4 @@
-*usr_03.txt*	For Vim version 8.1.  Last change: 2017 Jul 21
+*usr_03.txt*	For Vim version 8.1.  Last change: 2019 Nov 21
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -81,8 +81,8 @@ The "$" command moves the cursor to the end of a line.  If your keyboard has
 an <End> key it will do the same thing.
 
 The "^" command moves to the first non-blank character of the line.  The "0"
-command (zero) moves to the very first character of the line.  The <Home> key
-does the same thing.  In a picture:
+command (zero) moves to the very first character of the line, and the <Home>
+key does the same thing.  In a picture:
 
 		  ^
 	     <------------
@@ -221,7 +221,8 @@ you can see?  This figure shows the three commands you can use:
 		L -->	| text sample text	    |
 			+---------------------------+
 
-Hints: "H" stands for Home, "M" for Middle and "L" for Last.
+Hints: "H" stands for Home, "M" for Middle and "L" for Last.  Alternatively,
+"H" for high, "M" for Middle and "L" for low.
 
 ==============================================================================
 *03.6*	Telling where you are
@@ -298,22 +299,22 @@ To scroll one line at a time use CTRL-E (scroll up) and CTRL-Y (scroll down).
 Think of CTRL-E to give you one line Extra.  (If you use MS-Windows compatible
 key mappings CTRL-Y will redo a change instead of scroll.)
 
-To scroll forward by a whole screen (except for two lines) use CTRL-F.  The
-other way is backward, CTRL-B is the command to use.  Fortunately CTRL-F is
-Forward and CTRL-B is Backward, that's easy to remember.
+To scroll forward by a whole screen (except for two lines) use CTRL-F.  To
+scroll backwards, use CTRL-B.  These should be easy to remember: F for
+Forwards and B for Backwards.
 
 A common issue is that after moving down many lines with "j" your cursor is at
 the bottom of the screen.  You would like to see the context of the line with
 the cursor.  That's done with the "zz" command.
 
 	+------------------+		 +------------------+
-	| some text	   |		 | some text	    |
-	| some text	   |		 | some text	    |
-	| some text	   |		 | some text	    |
-	| some text	   |   zz  -->	 | line with cursor |
-	| some text	   |		 | some text	    |
-	| some text	   |		 | some text	    |
-	| line with cursor |		 | some text	    |
+	| earlier text	   |		 | earlier text	    |
+	| earlier text	   |		 | earlier text	    |
+	| earlier text	   |		 | earlier text	    |
+	| earlier text	   |   zz  -->	 | line with cursor |
+	| earlier text	   |		 | later text	    |
+	| earlier text	   |		 | later text	    |
+	| line with cursor |		 | later text	    |
 	+------------------+		 +------------------+
 
 The "zt" command puts the cursor line at the top, "zb" at the bottom.  There
@@ -353,7 +354,7 @@ The "?" command works like "/" but searches backwards: >
 
 The "N" command repeats the last search the opposite direction.  Thus using
 "N" after a "/" command searches backwards, using "N" after "?" searches
-forward.
+forwards.
 
 
 IGNORING CASE
@@ -462,8 +463,8 @@ really jump to that location.  Or type more to change the search string.
 	:set nowrapscan
 
 This stops the search at the end of the file.  Or, when you are searching
-backwards, at the start of the file.  The 'wrapscan' option is on by default,
-thus searching wraps around the end of the file.
+backwards, it stops the search at the start of the file.  The 'wrapscan'
+option is on by default, thus searching wraps around the end of the file.
 
 
 INTERMEZZO
@@ -485,7 +486,8 @@ Vim.  Example: >
 	Go:set hlsearch<Esc>
 
 "G" moves to the end of the file.  "o" starts a new line, where you type the
-":set" command.  You end insert mode with <Esc>.  Then write the file: >
+":set" command.  You end insert mode with <Esc>.  Then write and close the
+file: >
 
 	ZZ
 
@@ -499,8 +501,8 @@ Regular expressions are an extremely powerful and compact way to specify a
 search pattern.  Unfortunately, this power comes at a price, because regular
 expressions are a bit tricky to specify.
    In this section we mention only a few essential ones.  More about search
-patterns and commands in chapter 27 |usr_27.txt|.  You can find the full
-explanation here: |pattern|.
+patterns and commands can be found in chapter 27 |usr_27.txt|.  You can find
+the full explanation here: |pattern|.
 
 
 BEGINNING AND END OF A LINE
@@ -526,9 +528,9 @@ And with "/^the" we find this one:
 	the solder holding one of the chips melted and the ~
 	xxx
 
-You can try searching with "/^the$", it will only match a single line
-consisting of "the".  White space does matter here, thus if a line contains a
-space after the word, like "the ", the pattern will not match.
+You can try searching with "/^the$"; it will only match a single line
+consisting entirely of "the".  White space does matter here, thus if a line
+contains a space after the word, like "the ", the pattern will not match.
 
 
 MATCHING ANY SINGLE CHARACTER
@@ -563,20 +565,20 @@ where you came from, use this command: >
 
 This ` is a backtick or open single-quote character.
    If you use the same command a second time you will jump back again.  That's
-because the ` command is a jump itself, and the position from before this jump
-is remembered.
+because the "`" command is a jump itself, and the position from before this
+jump is remembered.
 
 Generally, every time you do a command that can move the cursor further than
 within the same line, this is called a jump.  This includes the search
 commands "/" and "n" (it doesn't matter how far away the match is).  But not
 the character searches with "fx" and "tx" or the word movements "w" and "e".
-   Also, "j" and "k" are not considered to be a jump.  Even when you use a
+   Also, "j" and "k" are not considered to be a jump, even when you use a
 count to make them move the cursor quite a long way away.
 
-The `` command jumps back and forth, between two points.  The CTRL-O command
+The "``" command jumps back and forth, between two points.  The CTRL-O command
 jumps to older positions (Hint: O for older).  CTRL-I then jumps back to newer
-positions (Hint: I is just next to O on the keyboard).  Consider this sequence
-of commands: >
+positions (Hint: for many common keyboard layouts, I is just next to O).
+Consider this sequence of commands: >
 
 	33G
 	/^The
@@ -614,9 +616,9 @@ Thus to move to the a mark:
 >
 	`a
 
-The command 'mark (single quotation mark, or apostrophe) moves you to the
-beginning of the line containing the mark.  This differs from the `mark
-command, which moves you to marked column.
+The command "'mark" (single quotation mark, or apostrophe) moves you to the
+beginning of the line containing the mark.  This differs from the "`mark"
+command, which also moves you to the marked column.
 
 The marks can be very useful when working on two related parts in a file.
 Suppose you have some text near the start of the file you need to look at,
diff --git a/runtime/doc/usr_04.txt b/runtime/doc/usr_04.txt
index 236f190c3..f3e287c01 100644
--- a/runtime/doc/usr_04.txt
+++ b/runtime/doc/usr_04.txt
@@ -1,4 +1,4 @@
-*usr_04.txt*	For Vim version 8.1.  Last change: 2014 Aug 29
+*usr_04.txt*	For Vim version 8.1.  Last change: 2019 Nov 21
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -33,7 +33,7 @@ using a count: "4x" deletes four characters.
 move word command.  In fact, the "d" command may be followed by any motion
 command, and it deletes from the current location to the place where the
 cursor winds up.
-   The "4w" command, for example, moves the cursor over four words.  The d4w
+   The "4w" command, for example, moves the cursor over four words.  The "d4w"
 command deletes four words.
 
 	To err is human. To really foul up you need a computer. ~
@@ -91,14 +91,14 @@ This "c2wbe<Esc>" contains these bits:
 	be	insert this text
 	<Esc>	back to Normal mode
 
-If you have paid attention, you will have noticed something strange: The space
-before "human" isn't deleted.  There is a saying that for every problem there
-is an answer that is simple, clear, and wrong.  That is the case with the
-example used here for the "cw" command.  The c operator works just like the
-d operator, with one exception: "cw".  It actually works like "ce", change to
-end of word.  Thus the space after the word isn't included.  This is an
-exception that dates back to the old Vi.  Since many people are used to it
-now, the inconsistency has remained in Vim.
+You will have noticed something strange: The space before "human" isn't
+deleted.  There is a saying that for every problem there is an answer that is
+simple, clear, and wrong.  That is the case with the example used here for the
+"cw" command.  The c operator works just like the d operator, with one
+exception: "cw".  It actually works like "ce", change to end of word.  Thus
+the space after the word isn't included.  This is an exception that dates back
+to the old Vi.  Since many people are used to it now, the inconsistency has
+remained in Vim.
 
 
 MORE CHANGES
@@ -114,7 +114,7 @@ Insert mode and append new text.
 SHORTCUTS
 
 Some operator-motion commands are used so often that they have been given a
-single letter command:
+single-letter command:
 
 	x  stands for  dl  (delete character under the cursor)
 	X  stands for  dh  (delete character left of the cursor)
@@ -138,6 +138,7 @@ REPLACING WITH ONE CHARACTER
 The "r" command is not an operator.  It waits for you to type a character, and
 will replace the character under the cursor with it.  You could do the same
 with "cl" or with the "s" command, but with "r" you don't have to press <Esc>
+to get back out of insert mode.
 
 	there is somerhing grong here ~
 	rT	     rt    rw
@@ -164,7 +165,7 @@ The "." command is one of the most simple yet powerful commands in Vim.  It
 repeats the last change.  For instance, suppose you are editing an HTML file
 and want to delete all the <B> tags.  You position the cursor on the first <
 and delete the <B> with the command "df>".  You then go to the < of the next
-</B> and kill it using the "." command.  The "." command executes the last
+</B> and delete it using the "." command.  The "." command executes the last
 change command (in this case, "df>").  To delete another tag, position the
 cursor on the < and use the "." command.
 
@@ -176,8 +177,8 @@ cursor on the < and use the "." command.
 	f<   find next <		       ------------->
 	.    repeat df>					    -->
 
-The "." command works for all changes you make, except for the "u" (undo),
-CTRL-R (redo) and commands that start with a colon (:).
+The "." command works for all changes you make, except for "u" (undo), CTRL-R
+(redo) and commands that start with a colon (:).
 
 Another example: You want to change the word "four" to "five".  It appears
 several times in your text.  You can do this quickly with this sequence of
@@ -201,7 +202,8 @@ change.  Then you can use Visual mode.
 You start Visual mode by pressing "v".  You move the cursor over the text you
 want to work on.  While you do this, the text is highlighted.  Finally type
 the operator command.
-   For example, to delete from halfway one word to halfway another word:
+   For example, to delete from the middle of one word to the middle of another
+word:
 
 		This is an examination sample of visual mode ~
 			       ---------->
@@ -269,8 +271,8 @@ where they open a new line below or above the cursor.
 ==============================================================================
 *04.5*	Moving text
 
-When you delete something with the "d", "x", or another command, the text is
-saved.  You can paste it back by using the p command.  (The Vim name for
+When you delete something with "d", "x", or another command, the text is
+saved.  You can paste it back by using the "p" command.  (The Vim name for
 this is put).
    Take a look at how this works.  First you will delete an entire line, by
 putting the cursor on the line you want to delete and typing "dd".  Now you
@@ -362,11 +364,11 @@ Use "y$" to yank to the end of the line.
 
 If you are using the GUI version of Vim (gvim), you can find the "Copy" item
 in the "Edit" menu.  First select some text with Visual mode, then use the
-Edit/Copy menu.  The selected text is now copied to the clipboard.  You can
-paste the text in other programs.  In Vim itself too.
+Edit/Copy menu item.  The selected text is now copied to the clipboard.  You
+can paste the text in other programs.  In Vim itself too.
 
 If you have copied text to the clipboard in another application, you can paste
-it in Vim with the Edit/Paste menu.  This works in Normal mode and Insert
+it in Vim with the Edit/Paste menu item.  This works in Normal mode and Insert
 mode.  In Visual mode the selected text is replaced with the pasted text.
 
 The "Cut" menu item deletes the text before it's put on the clipboard.  The
@@ -385,7 +387,7 @@ To put text from the clipboard back into the text: >
 	"*p
 
 This only works on versions of Vim that include clipboard support.  More about
-the clipboard in section |09.3| and here: |clipboard|.
+the clipboard can be found in section |09.3| and here: |clipboard|.
 
 ==============================================================================
 *04.8*	Text objects
@@ -401,8 +403,8 @@ to do this: "daw".
 
 The "d" of "daw" is the delete operator.  "aw" is a text object.  Hint: "aw"
 stands for "A Word".  Thus "daw" is "Delete A Word".  To be precise, the white
-space after the word is also deleted (the white space before the word at the
-end of the line).
+space after the word is also deleted (or the white space before the word if at
+the end of the line).
 
 Using text objects is the third way to make changes in Vim.  We already had
 operator-motion and Visual mode.  Now we add operator-text object.
@@ -429,11 +431,11 @@ sentence "Another line.":
 	some text. ~
 
 "cis" consists of the "c" (change) operator and the "is" text object.  This
-stands for "Inner Sentence".  There is also the "as" (a sentence) object.  The
-difference is that "as" includes the white space after the sentence and "is"
-doesn't.  If you would delete a sentence, you want to delete the white space
-at the same time, thus use "das".  If you want to type new text the white
-space can remain, thus you use "cis".
+stands for "Inner Sentence".  There is also the "as" ("A Sentence") object.
+The difference is that "as" includes the white space after the sentence and
+"is" doesn't.  If you would delete a sentence, you want to delete the white
+space at the same time, thus use "das".  If you want to type new text the
+white space can remain, thus you use "cis".
 
 You can also use text objects in Visual mode.  It will include the text object
 in the Visual selection.  Visual mode continues, thus you can do this several
@@ -470,13 +472,13 @@ character.
 *04.10*	Conclusion
 
 The operators, movement commands and text objects give you the possibility to
-make lots of combinations.  Now that you know how it works, you can use N
+make lots of combinations.  Now that you know how they work, you can use N
 operators with M movement commands to make N * M commands!
 
-You can find a list of operators here: |operator|
+You can find a list of operators here: |operator|.
 
 For example, there are many other ways to delete pieces of text.  Here are a
-few often used ones:
+few common ones:
 
 x	delete character under the cursor (short for "dl")
 X	delete character before the cursor (short for "dh")
@@ -492,14 +494,14 @@ If you use "c" instead of "d" they become change commands.  And with "y" you
 yank the text.  And so forth.
 
 
-There are a few often used commands to make changes that didn't fit somewhere
+There are a few common commands to make changes that didn't fit somewhere
 else:
 
-	~	change case of the character under the cursor, and move the
+	~	Change case of the character under the cursor, and move the
 		cursor to the next character.  This is not an operator (unless
 		'tildeop' is set), thus you can't use it with a motion
-		command.  It does work in Visual mode and changes case for
-		all the selected text then.
+		command.  It does work in Visual mode, where it changes case
+		for all the selected text.
 
 	I	Start Insert mode after moving the cursor to the first
 		non-blank in the line.
diff --git a/runtime/doc/usr_10.txt b/runtime/doc/usr_10.txt
index d551d119d..10340fd29 100644
--- a/runtime/doc/usr_10.txt
+++ b/runtime/doc/usr_10.txt
@@ -1,4 +1,4 @@
-*usr_10.txt*	For Vim version 8.1.  Last change: 2006 Nov 05
+*usr_10.txt*	For Vim version 8.1.  Last change: 2019 Nov 22
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -370,7 +370,8 @@ into "barfoo".
 was specified in this example.  This is different from ":substitute", which
 works on one line without a range.
    The command isn't perfect, since it also matches lines where "//" appears
-halfway a line, and the substitution will also take place before the "//".
+halfway through a line, and the substitution will also take place before the
+"//".
 
 Just like with ":substitute", any pattern can be used.  When you learn more
 complicated patterns later, you can use them here.
@@ -634,8 +635,8 @@ using it.  To check the current value of 'textwidth': >
 	:set textwidth
 
 Now lines will be broken to take only up to 72 characters.  But when you
-insert text halfway a line, or when you delete a few words, the lines will get
-too long or too short.  Vim doesn't automatically reformat the text.
+insert text halfway through a line, or when you delete a few words, the lines
+will get too long or too short.  Vim doesn't automatically reformat the text.
    To tell Vim to format the current paragraph: >
 
 	gqap
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 79e3a087c..0024ce7ad 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 8.1.  Last change: 2019 Nov 17
+*usr_41.txt*	For Vim version 8.1.  Last change: 2019 Nov 21
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/keymap/oldturkic-yenisei_utf-8.vim b/runtime/keymap/oldturkic-yenisei_utf-8.vim
index f939f0a40..09722e70a 100644
--- a/runtime/keymap/oldturkic-yenisei_utf-8.vim
+++ b/runtime/keymap/oldturkic-yenisei_utf-8.vim
@@ -5,7 +5,7 @@
 " UTF-8) should work.
 scriptencoding utf-8
 
-let b:keymap_name = "oto"
+let b:keymap_name = "oty"
 highlight lCursor guibg=red guifg=NONE
 
 " map F8 to toggle keymap (Ctrl-^ not present on keyboard)
@@ -22,7 +22,10 @@ I	𐰄	10C04	OLD TURKIC LETTER YENISEI I
 04	𐰄	10C04	OLD TURKIC LETTER YENISEI I
 E	𐰅	10C05	OLD TURKIC LETTER YENISEI E
 05	𐰅	10C05	OLD TURKIC LETTER YENISEI E
-OE	𐰈	10C08	OLD TURKIC LETTER YENISEI OE
+OO	𐰆	10C06	OLD TURKIC LETTER ORKHON O
+U	𐰆	10C06	OLD TURKIC LETTER ORKHON O
+06	𐰆	10C06	OLD TURKIC LETTER ORKHON O
+E	𐰈	10C08	OLD TURKIC LETTER YENISEI OE
 UE	𐰈	10C08	OLD TURKIC LETTER YENISEI OE
 08	𐰈	10C08	OLD TURKIC LETTER YENISEI OE
 ab	𐰊	10C0A	OLD TURKIC LETTER YENISEI AB
@@ -42,6 +45,10 @@ g2	𐰐	10C10	OLD TURKIC LETTER YENISEI AEG
 ad	𐰒	10C12	OLD TURKIC LETTER YENISEI AD
 d1	𐰒	10C12	OLD TURKIC LETTER YENISEI AD
 12	𐰒	10C12	OLD TURKIC LETTER YENISEI AD
+aed	𐰓	10C13	OLD TURKIC LETTER ORKHON AED
+ed	𐰓	10C13	OLD TURKIC LETTER ORKHON AED
+d2	𐰓	10C13	OLD TURKIC LETTER ORKHON AED
+13	𐰓	10C13	OLD TURKIC LETTER ORKHON AED
 ez	𐰕	10C15	OLD TURKIC LETTER YENISEI EZ
 z	𐰕	10C15	OLD TURKIC LETTER YENISEI EZ
 15	𐰕	10C15	OLD TURKIC LETTER YENISEI EZ
@@ -65,6 +72,19 @@ al	𐰟	10C1F	OLD TURKIC LETTER YENISEI AL
 l	𐰟	10C1F	OLD TURKIC LETTER YENISEI AL
 l1	𐰟	10C1F	OLD TURKIC LETTER YENISEI AL
 1f	𐰟	10C1F	OLD TURKIC LETTER YENISEI AL
+ael	𐰠	10C20	OLD TURKIC LETTER ORKHON AEL
+el	𐰠	10C20	OLD TURKIC LETTER ORKHON AEL
+l2	𐰠	10C20	OLD TURKIC LETTER ORKHON AEL
+20	𐰠	10C20	OLD TURKIC LETTER ORKHON AEL
+elt	𐰡	10C21	OLD TURKIC LETTER ORKHON ELT
+lt	𐰡	10C21	OLD TURKIC LETTER ORKHON ELT
+21	𐰡	10C21	OLD TURKIC LETTER ORKHON ELT
+em	𐰢	10C22	OLD TURKIC LETTER ORKHON EM
+m	𐰢	10C22	OLD TURKIC LETTER ORKHON EM
+22	𐰢	10C22	OLD TURKIC LETTER ORKHON EM
+an	𐰣	10C23	OLD TURKIC LETTER ORKHON AN
+n1	𐰣	10C23	OLD TURKIC LETTER ORKHON AN
+23	𐰣	10C23	OLD TURKIC LETTER ORKHON AN
 aen	𐰥	10C25	OLD TURKIC LETTER YENISEI AEN
 en	𐰥	10C25	OLD TURKIC LETTER YENISEI AEN
 n2	𐰥	10C25	OLD TURKIC LETTER YENISEI AEN
@@ -84,6 +104,14 @@ ng	𐰬	10C2C	OLD TURKIC LETTER YENISEI ANG
 aeng	𐰮	10C2E	OLD TURKIC LETTER YENISEI AENG
 eng	𐰮	10C2E	OLD TURKIC LETTER YENISEI AENG
 2e	𐰮	10C2E	OLD TURKIC LETTER YENISEI AENG
+ep	𐰯	10C2F	OLD TURKIC LETTER ORKHON EP
+p	𐰯	10C2F	OLD TURKIC LETTER ORKHON EP
+2f	𐰯	10C2F	OLD TURKIC LETTER ORKHON EP
+op	𐰰	10C30	OLD TURKIC LETTER ORKHON OP
+up	𐰰	10C30	OLD TURKIC LETTER ORKHON OP
+30	𐰰	10C30	OLD TURKIC LETTER ORKHON OP
+ic	𐰱	10C31	OLD TURKIC LETTER ORKHON IC
+31	𐰱	10C31	OLD TURKIC LETTER ORKHON IC
 ec	𐰳	10C33	OLD TURKIC LETTER YENISEI EC
 c	𐰳	10C33	OLD TURKIC LETTER YENISEI EC
 33	𐰳	10C33	OLD TURKIC LETTER YENISEI EC
@@ -100,6 +128,17 @@ ar	𐰻	10C3B	OLD TURKIC LETTER YENISEI AR
 r	𐰻	10C3B	OLD TURKIC LETTER YENISEI AR
 r1	𐰻	10C3B	OLD TURKIC LETTER YENISEI AR
 3b	𐰻	10C3B	OLD TURKIC LETTER YENISEI AR
+aer	𐰼	10C3C	OLD TURKIC LETTER ORKHON AER
+er	𐰼	10C3C	OLD TURKIC LETTER ORKHON AER
+r2	𐰼	10C3C	OLD TURKIC LETTER ORKHON AER
+3c	𐰼	10C3C	OLD TURKIC LETTER ORKHON AER
+as	𐰽	10C3D	OLD TURKIC LETTER ORKHON AS
+s1	𐰽	10C3D	OLD TURKIC LETTER ORKHON AS
+3d	𐰽	10C3D	OLD TURKIC LETTER ORKHON AS
+aes	𐰾	10C3E	OLD TURKIC LETTER ORKHON AES
+es	𐰾	10C3E	OLD TURKIC LETTER ORKHON AES
+s2	𐰾	10C3E	OLD TURKIC LETTER ORKHON AES
+3e	𐰾	10C3E	OLD TURKIC LETTER ORKHON AES
 ash	𐱀	10C40	OLD TURKIC LETTER YENISEI ASH
 sh1	𐱀	10C40	OLD TURKIC LETTER YENISEI ASH
 40	𐱀	10C40	OLD TURKIC LETTER YENISEI ASH
@@ -113,3 +152,8 @@ aet	𐱆	10C46	OLD TURKIC LETTER YENISEI AET
 et	𐱆	10C46	OLD TURKIC LETTER YENISEI AET
 t2	𐱆	10C46	OLD TURKIC LETTER YENISEI AET
 46	𐱆	10C46	OLD TURKIC LETTER YENISEI AET
+ot	𐱇	10C47	OLD TURKIC LETTER ORKHON OT
+ut	𐱇	10C47	OLD TURKIC LETTER ORKHON OT
+47	𐱇	10C47	OLD TURKIC LETTER ORKHON OT
+bash	𐱈	10C48	OLD TURKIC LETTER ORKHON BASH
+48	𐱈	10C48	OLD TURKIC LETTER ORKHON BASH
diff --git a/runtime/lang/menu_tr.cp1254.vim b/runtime/lang/menu_tr.cp1254.vim
index 2c5158da5..5c2067e06 100644
--- a/runtime/lang/menu_tr.cp1254.vim
+++ b/runtime/lang/menu_tr.cp1254.vim
@@ -1,3 +1,3 @@
 " Menu Translations:	Turkish
 
-source <sfile>:p:h/menu_tr_tr.iso_8859-9.vim
+source <sfile>:p:h/menu_tr_tr.cp1254.vim
\ No newline at end of file
diff --git a/runtime/lang/menu_tr.iso_8859-9.vim b/runtime/lang/menu_tr.iso_8859-9.vim
index 2c5158da5..8712e6ac9 100644
--- a/runtime/lang/menu_tr.iso_8859-9.vim
+++ b/runtime/lang/menu_tr.iso_8859-9.vim
@@ -1,3 +1,3 @@
 " Menu Translations:	Turkish
 
-source <sfile>:p:h/menu_tr_tr.iso_8859-9.vim
+source <sfile>:p:h/menu_tr_tr.iso_8859-9.vim
\ No newline at end of file
diff --git a/runtime/lang/menu_tr_tr.cp1254.vim b/runtime/lang/menu_tr_tr.cp1254.vim
index 2c5158da5..687e2ac25 100644
--- a/runtime/lang/menu_tr_tr.cp1254.vim
+++ b/runtime/lang/menu_tr_tr.cp1254.vim
@@ -1,3 +1,308 @@
 " Menu Translations:	Turkish
+" Maintainer:		Emir SARI <bitigchi@me.com>
 
-source <sfile>:p:h/menu_tr_tr.iso_8859-9.vim
+if exists("did_menu_trans")
+   finish
+endif
+
+let did_menu_trans = 1
+let s:keepcpo= &cpo
+set cpo&vim
+scriptencoding cp1254
+
+" Top
+menutrans &File		&Dosya
+menutrans &Edit		D�&zen
+menutrans &Tools	&Ara�lar
+menutrans &Syntax	&S�zdizim
+menutrans &Buffers	A&rabellekler
+menutrans &Window	&Pencere
+menutrans &Help		&Yard�m
+
+" Help menu
+menutrans &Overview<Tab><F1>	&Genel\ Bak��<Tab><F1>
+menutrans &User\ Manual		&Kullan�m\ K�lavuzu
+menutrans &How-To\ Links	&Nas�l\ Yap�l�r?
+menutrans &Find\.\.\.		&Bul\.\.\.
+"--------------------
+menutrans &Credits		&Te�ekk�rler
+menutrans Co&pying		&Da��t�m
+menutrans &Sponsor/Register	&Sponsorluk/Kay�t
+menutrans O&rphans		&Yetimler
+"--------------------
+menutrans &Version	S�r�m\ &Bilgisi
+menutrans &About	&Hakk�nda
+
+" File menu
+menutrans &Open\.\.\.<Tab>:e		&A�\.\.\.<Tab>:e
+menutrans Sp&lit-Open\.\.\.<Tab>:sp	&Yeni\ B�l�mde\ A�\.\.\.<Tab>:sp
+menutrans Open\ Tab\.\.\.<Tab>:tabnew	S&ekme\ A�\.\.\.<Tab>:tabnew
+menutrans &New<Tab>:enew		Yeni\ &Sekme<Tab>:enew
+menutrans &Close<Tab>:close		Ka&pat<Tab>:close
+"--------------------
+menutrans &Save<Tab>:w			Kayde&t<Tab>:w
+menutrans Save\ &As\.\.\.<Tab>:sav	&Farkl� Kaydet\.\.\.<Tab>:sav
+"--------------------
+menutrans Split\ &Diff\ With\.\.\.	Ka&r��la�t�r\.\.\.
+menutrans Split\ Patched\ &By\.\.\.	Ya&malar\ Dahil\ Kar��la�t�r\.\.\.
+"--------------------
+menutrans &Print		Ya&zd�r
+menutrans Sa&ve-Exit<Tab>:wqa	Kaydet\ &ve ��k<Tab>:wqa
+menutrans E&xit<Tab>:qa		��&k<Tab>:qa
+
+" Edit menu
+menutrans &Undo<Tab>u		&Geri\ Al<Tab>u
+menutrans &Redo<Tab>^R		&Yinele<Tab>^R
+menutrans Rep&eat<Tab>\.	Son\ Komutu\ Y&inele<Tab>\.
+"--------------------
+menutrans Cu&t<Tab>"+x		&Kes<Tab>"+x
+menutrans &Copy<Tab>"+y		K&opyala<Tab>"+y
+menutrans &Paste<Tab>"+gP	Ya&p��t�r<Tab>"+gP
+menutrans Put\ &Before<Tab>[p	�&n�ne Koy<Tab>[p
+menutrans Put\ &After<Tab>]p	A&rkas�na Koy<Tab>]p
+menutrans &Delete<Tab>x		Si&l<Tab>x
+menutrans &Select\ All<Tab>ggVG	T�&m�n�\ Se�<Tab>ggVG
+"--------------------
+" Athena GUI only
+menutrans &Find<Tab>/			&Bul<Tab>/
+menutrans Find\ and\ Rep&lace<Tab>:%s	Bul\ &ve\ De�i�tir<Tab>:%s
+" End Athena GUI only
+menutrans &Find\.\.\.<Tab>/		&Bul\.\.\.<Tab>/
+menutrans Find\ and\ Rep&lace\.\.\.	Bul\ ve\ &De�i�tir\.\.\.
+menutrans Find\ and\ Rep&lace\.\.\.<Tab>:%s	Bul\ ve\ &De�i�tir\.\.\.<Tab>:%s
+menutrans Find\ and\ Rep&lace\.\.\.<Tab>:s	Bul\ ve\ &De�i�tir\.\.\.<Tab>:s
+"--------------------
+menutrans Settings\ &Window	&Ayarlar\ Penceresi
+menutrans Startup\ &Settings	Ba�lan&g��\ Ayarlar�
+menutrans &Global\ Settings	Ge&nel\ Ayarlar
+menutrans F&ile\ Settings	&Dosya\ Ayarlar�
+menutrans C&olor\ Scheme	&Renk\ D�zeni
+menutrans &Keymap		D��me\ &E�lem
+menutrans Select\ Fo&nt\.\.\.	Ya&z�tipi Se�\.\.\.
+
+">>>----------------- Edit/Global settings
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!		Dizgi\ &Vurgulamas�n�\ A�/Kapat<Tab>:set\ hls!
+menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic!		 	B�Y�K/k���k\ Harf\ &Duyarl�\ A�/Kapat<Tab>:set\ ic!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!	E�&le�en\ �kilileri\ A�/Kapat<Tab>:set\ sm!
+menutrans &Context\ Lines					�&mle�le\ Oynayan\ Sat�rlar
+menutrans &Virtual\ Edit					&Sanal\ D�zenleme
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!			Ekleme\ &Kipini\ A�/Kapat<Tab>:set\ im!
+menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!		&Vi\ Uyumlu\ Kipi\ A�/Kapat<Tab>:set\ cp!
+menutrans Search\ &Path\.\.\.					&Arama\ Yolu\.\.\.
+menutrans Ta&g\ Files\.\.\.					&Etiket\ Dosyalar�\.\.\.
+"
+menutrans Toggle\ &Toolbar		&Ara�\ �ubu�unu\ A�/Kapat
+menutrans Toggle\ &Bottom\ Scrollbar	A&lt\ Kayd�rma\ �ubu�unu\ A�/Kapat
+menutrans Toggle\ &Left\ Scrollbar	&Sol\ Kayd�rma\ �ubu�unu\ A�/Kapat
+menutrans Toggle\ &Right\ Scrollbar	S&a�\ Kayd�rma\ �ubu�unu\ A�/Kapat
+
+">>>->>>------------- Edit/Global settings/Virtual edit
+menutrans Never			Kapal�
+menutrans Block\ Selection	Blok\ Se�imi
+menutrans Insert\ Mode		Ekleme\ Kipi
+menutrans Block\ and\ Insert	Blok\ Se�iminde\ ve\ Ekleme\ Kipinde
+menutrans Always				Her\ Zaman\ A��k
+">>>----------------- Edit/File settings
+menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!		&Sat�r\ Numaraland�rmay�\ A�/Kapat<Tab>:set\ nu!
+menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!	&G�receli\ Sat�r\ Numaraland�rmay�\ A�/Kapat<Tab>:set\ nru!
+menutrans Toggle\ &List\ Mode<Tab>:set\ list!			G�&r�nmeyen\ Karakterleri\ A�/Kapat<Tab>:set\ list!
+menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap!		Sa&t�r\ Kayd�rmay�\ A�/Kapat<Tab>:set\ wrap!
+menutrans Toggle\ W&rapping\ at\ Word<Tab>:set\ lbr!		S�&zc�k\ Kayd�rmay�\ A�/Kapat<Tab>:set\ lbr!
+menutrans Toggle\ Tab\ &Expanding-tab<Tab>:set\ et!		S&ekmeleri\ Bo�luklara\ D�n��t�rmeyi\ A�/Kapat<Tab>:set\ et!
+menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai!		&Otomatik\ Girintilemeyi\ A�/Kapat<Tab>:set\ ai!
+menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin!		&C\ Tarz�\ Girintilemeyi\ A�/Kapat<Tab>:set\ cin!
+">>>---
+menutrans &Shiftwidth		&Girinti\ D�zeyi
+menutrans Soft\ &Tabstop	&Sekme\ Geni�li�i
+menutrans Te&xt\ Width\.\.\.	&Metin\ Geni�li�i\.\.\.
+menutrans &File\ Format\.\.\.	&Dosya\ Bi�imi\.\.\.
+
+" Tools menu
+menutrans &Jump\ to\ This\ Tag<Tab>g^]	�&u\ Etikete\ Atla<Tab>g^]
+menutrans Jump\ &Back<Tab>^T		&Geri\ D�n<Tab>^T
+menutrans Build\ &Tags\ File		&Etiket\ Dosyas�\ Olu�tur
+"-------------------
+menutrans &Folding	&K�v�rmalar
+menutrans &Spelling	&Yaz�m\ Denetimi
+menutrans &Diff		&Ayr�mlar\ (diff)
+"-------------------
+menutrans &Make<Tab>:make			&Derle<Tab>:make
+menutrans &List\ Errors<Tab>:cl			&Hatalar�\ Listele<Tab>:cl
+menutrans L&ist\ Messages<Tab>:cl!		�&letileri\ Listele<Tab>:cl!
+menutrans &Next\ Error<Tab>:cn			Bir\ &Sonraki\ Hata<Tab>:cn
+menutrans &Previous\ Error<Tab>:cp		Bir\ �&nceki\ Hata<Tab>:cp
+menutrans &Older\ List<Tab>:cold		Daha\ &Eski\ Hatalar<Tab>:cold
+menutrans N&ewer\ List<Tab>:cnew		Daha\ &Yeni\ Hatalar<Tab>:cnew
+menutrans Error\ &Window			Hatalar\ &Penceresi
+menutrans Se&t\ Compiler			De&rleyici\ Se�
+menutrans Show\ Compiler\ Se&ttings\ in\ Menu	Derleyici\ Ayarlar�n�\ Men�de\ &G�ster 
+"-------------------
+menutrans &Convert\ to\ HEX<Tab>:%!xxd		HEX'e\ D�&n��t�r<Tab>:%!xxd
+menutrans Conve&rt\ Back<Tab>:%!xxd\ -r		HEX'&ten\ D�n��t�r<Tab>:%!xxd\ -r
+">>>---------------- Tools/Spelling
+menutrans &Spell\ Check\ On			Yaz�m\ Denetimini\ &A�
+menutrans Spell\ Check\ &Off			Yaz�m\ Denetimini\ &Kapat
+menutrans To\ &Next\ Error<Tab>]s		Bir\ &Sonraki\ Hata<Tab>]s
+menutrans To\ &Previous\ Error<Tab>[s		Bir\ �&nceki\ Hata<Tab>[s
+menutrans Suggest\ &Corrections<Tab>z=		D�&zeltme\ �ner<Tab>z=
+menutrans &Repeat\ Correction<Tab>:spellrepall	D�zeltmeyi\ &Yinele<Tab>spellrepall
+"-------------------
+menutrans Set\ Language\ to\ "en"	Dili\ "en"\ yap
+menutrans Set\ Language\ to\ "en_au"	Dili\ "en_au"\ yap
+menutrans Set\ Language\ to\ "en_ca"	Dili\ "en_ca"\ yap
+menutrans Set\ Language\ to\ "en_gb"	Dili\ "en_gb"\ yap
+menutrans Set\ Language\ to\ "en_nz"	Dili\ "en_nz"\ yap
+menutrans Set\ Language\ to\ "en_us"	Dili\ "en_us"\ yap
+menutrans &Find\ More\ Languages	&Ba�ka\ Diller\ Bul
+let g:menutrans_set_lang_to =		'Dil Y�kle'
+
+" The Spelling popup menu
+let g:menutrans_spell_change_ARG_to =		'D�zeltilecek:\ "%s"\ ->'
+let g:menutrans_spell_add_ARG_to_word_list =	'"%s"\ s�zc���n�\ s�zl��e\ ekle'
+let g:menutrans_spell_ignore_ARG =		'"%s"\ s�zc���n�\ yoksay'
+">>>---------------- Folds
+menutrans &Enable/Disable\ Folds<Tab>zi		&K�v�rmalar�\ A�/Kapat<Tab>zi
+menutrans &View\ Cursor\ Line<Tab>zv		�&mlecin\ Oldu�u\ Sat�r�\ G�r�nt�le<Tab>zv
+menutrans Vie&w\ Cursor\ Line\ Only<Tab>zMzx	Ya&ln�zca\ �mlecin\ Oldu�u\ Sat�r�\ G�r�nt�le<Tab>zMzx
+menutrans C&lose\ More\ Folds<Tab>zm		&Daha\ Fazla\ K�v�rma\ Kapat<Tab>zm
+menutrans &Close\ All\ Folds<Tab>zM		B�t�n\ K�&v�rmalar�\ Kapat<Tab>zM
+menutrans &Open\ All\ Folds<Tab>zR		B�&t�n\ K�v�rmalar�\ A�<Tab>zR
+menutrans O&pen\ More\ Folds<Tab>zr		D&aha\ Fazla\ K�v�rma\ A�<Tab>zr
+menutrans Fold\ Met&hod				K�v�&rma\ Y�ntemi
+menutrans Create\ &Fold<Tab>zf			K�v�rma\ &Olu�tur<Tab>zf
+menutrans &Delete\ Fold<Tab>zd			K�v�rma\ &Sil<Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD		T�&m\ K�v�rmalar�\ Sil<Tab>zD
+menutrans Fold\ col&umn\ Width			K�v�rma\ S�tunu\ &Geni�li�i
+">>>->>>----------- Tools/Folds/Fold Method
+menutrans M&anual	&El\ �le
+menutrans I&ndent	&Girinti
+menutrans E&xpression	�&fade
+menutrans S&yntax	&S�zdizim
+menutrans Ma&rker	�&mleyici
+">>>--------------- Tools/Diff
+menutrans &Update	&G�ncelle
+menutrans &Get\ Block	Blo�u\ &Al
+menutrans &Put\ Block	Blo�u\ &Koy
+">>>--------------- Tools/Diff/Error window
+menutrans &Update<Tab>:cwin	&G�ncelle<Tab>:cwin
+menutrans &Close<Tab>:cclose	&Kapat<Tab>:cclose
+menutrans &Open<Tab>:copen	&A�<Tab>:copen
+
+" Syntax menu
+menutrans &Show\ File\ Types\ in\ Menu	Dosya\ T�rlerini\ Men�de\ &G�ster
+menutrans Set\ '&syntax'\ only		Yaln�zca\ 'syntax'\ &Ayarla
+menutrans Set\ '&filetype'\ too		'filetype'\ ��in\ &de\ Ayarla
+menutrans &Off				&Kapat
+menutrans &Manual			&El\ �le
+menutrans A&utomatic			&Otomatik
+menutrans On/Off\ for\ &This\ File	&Bu\ Dosya\ ��in\ A�/Kapat
+menutrans Co&lor\ Test			&Renk\ Testi
+menutrans &Highlight\ Test		&Vurgulama\ Testi
+menutrans &Convert\ to\ HTML		&HTML'ye\ D�n��t�r
+
+" Buffers menu
+menutrans &Refresh\ menu	&Men�y�\ G�ncelle
+menutrans Delete		&Sil
+menutrans &Alternate		�&teki
+menutrans &Next			So&nraki
+menutrans &Previous		�n&ceki
+menutrans [No\ File]		[Dosya\ Yok]
+
+" Window menu
+menutrans &New<Tab>^Wn			Yeni\ &Pencere<Tab>^Wn
+menutrans S&plit<Tab>^Ws		Pencereyi\ &B�l<Tab>^Ws
+menutrans Sp&lit\ To\ #<Tab>^W^^	Pencereyi\ Ba�kas�na\ B�&l<Tab>^W^^
+menutrans Split\ &Vertically<Tab>^Wv	Pencereyi\ &Dikey\ Olarak\ B�l<Tab>^Wv
+menutrans Split\ File\ E&xplorer	Yeni\ B�l�&mde\ Dosya\ Gezginini\ A�
+"
+menutrans &Close<Tab>^Wc		Pen&cereyi\ Kapat<Tab>^Wc
+menutrans Close\ &Other(s)<Tab>^Wo	Di�er\ Pencerele&ri\ Kapat<Tab>^Wo
+"
+menutrans Move\ &To		&Ta��
+menutrans Rotate\ &Up<Tab>^WR	&Yukar�\ Ta��<Tab>^WR
+menutrans Rotate\ &Down<Tab>^Wr	&A�a��\ Ta��<Tab>^Wr
+"
+menutrans &Equal\ Size<Tab>^W=	&E�it\ Boyut<Tab>^W=
+menutrans &Max\ Height<Tab>^W_	E&n\ B�y�k\ Y�kseklik<Tab>^W_
+menutrans M&in\ Height<Tab>^W1_	En\ K���k\ Y�ksekl&ik<Tab>^W1_
+menutrans Max\ &Width<Tab>^W\|	En\ B�y�k\ Gen&i�lik<Tab>^W\|
+menutrans Min\ Widt&h<Tab>^W1\|	En\ K���k\ Geni�li&k<Tab>^W1\|
+
+">>>----------------- Window/Move To
+menutrans &Top<Tab>^WK		&Yukar�<Tab>^WK
+menutrans &Bottom<Tab>^WJ	&A�a��<Tab>^WJ
+menutrans &Left\ Side<Tab>^WH	So&la<Tab>^WH
+menutrans &Right\ Side<Tab>^WL	&Sa�a<Tab>^WL
+
+" The popup menu
+menutrans &Undo			&Geri\ Al
+menutrans Cu&t			&Kes
+menutrans &Copy			K&opyala
+menutrans &Paste		&Yap��t�r
+menutrans &Delete		&Sil
+menutrans Select\ Blockwise	&Blok\ Bi�iminde\ Se�
+menutrans Select\ &Word		S�&zc�k\ Se�
+menutrans Select\ &Sentence	&T�mce\ Se�
+menutrans Select\ Pa&ragraph	&Paragraf\ Se�
+menutrans Select\ &Line		S&at�r\ Se�
+menutrans Select\ &Block	Bl&ok\ Se�
+menutrans Select\ &All		T�m�&n�\ Se�
+
+" The GUI toolbar
+if has("toolbar")
+	if exists("*Do_toolbar_tmenu")
+		delfun Do_toolbar_tmenu
+	endif
+
+	fun Do_toolbar_tmenu()
+		tmenu ToolBar.Open	Dosya A�
+		tmenu ToolBar.Save	Dosya Kaydet
+		tmenu ToolBar.SaveAll	T�m Dosyalar� Kaydet
+		tmenu ToolBar.Print	Yazd�r
+		tmenu ToolBar.Undo	Geri Al
+		tmenu ToolBar.Redo	Yinele
+		tmenu ToolBar.Cut	Kes
+		tmenu ToolBar.Copy	Kopyala
+		tmenu ToolBar.Paste	Yap��t�r
+		tmenu ToolBar.Find	Bul...
+		tmenu ToolBar.FindNext	Sonrakini Bul
+		tmenu ToolBar.FindPrev	�ncekini Bul
+		tmenu ToolBar.Replace	Bul ve De�i�tir...
+		if 0	" disabled; These are in the Windows menu
+			tmenu ToolBar.New	Yeni Pencere
+			tmenu ToolBar.WinSplit	Pencereyi B�l
+			tmenu ToolBar.WinMax	En B�y�k Pencere Y�ksekli�i
+			tmenu ToolBar.WinMin	En K���k Pencere Y�ksekli�i
+			tmenu ToolBar.WinClose	Pencereyi Kapat
+		endif
+		tmenu ToolBar.LoadSesn	Oturum Y�kle
+		tmenu ToolBar.SaveSesn	Oturum Kaydet
+		tmenu ToolBar.RunScript	Betik �al��t�r
+		tmenu ToolBar.Make	Derle
+		tmenu ToolBar.Shell	Kabuk
+		tmenu ToolBar.RunCtags	Etiket Dosyas� Olu�tur
+		tmenu ToolBar.TagJump	Etikete Atla
+		tmenu ToolBar.Help	Yard�m
+		tmenu ToolBar.FindHelp	Yard�m Bul
+	endfun
+endif
+
+" Dialog texts
+" Find in help dialog
+let g:menutrans_help_dialog = "Yard�m i�in komut veya s�zc�k girin:\n\nEkleme Kipi komutlar�n� aramak i�in i_ ekleyin (�rne�in i_CTRL-X)\nNormal Kip komutlar�n� aramak i�in _c ekleyin (�rne�in c_<Del>)\nSe�enekler hakk�nda yard�m almak i�in ' ekleyin (�rne�in 'shiftwidth')"
+
+" Searh path dialog
+let g:menutrans_path_dialog = "Dosya aramas� i�in yol belirtin.\nDizin adlar� virg�llerle ayr�l�r."
+
+" Tag files dialog
+let g:menutrans_tags_dialog = "Etiket dosyas� adlar� belirtin (virg�lle ay�rarak).\n"
+
+" Text width dialog
+let g:menutrans_textwidth_dialog = "Bi�imlendirme i�in metin geni�li�ini belirtin.\nBi�imlendirme iptali i�in 0 girin."
+
+" File format dialog
+let g:menutrans_fileformat_dialog = "Dosya bi�imi se�in"
+let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n�&ptal"
+let menutrans_no_file = "[Dosya Yok]"
+let &cpo = s:keepcpo
+unlet s:keepcpo
diff --git a/runtime/lang/menu_tr_tr.iso_8859-9.vim b/runtime/lang/menu_tr_tr.iso_8859-9.vim
index 9f59258da..3e01c0c8a 100644
--- a/runtime/lang/menu_tr_tr.iso_8859-9.vim
+++ b/runtime/lang/menu_tr_tr.iso_8859-9.vim
@@ -1,331 +1,308 @@
 " Menu Translations:	Turkish
-" Maintainer:			Emir SARI <bitigchi@me.com>
+" Maintainer:		Emir SARI <bitigchi@me.com>
 
 if exists("did_menu_trans")
    finish
 endif
+
 let did_menu_trans = 1
 let s:keepcpo= &cpo
 set cpo&vim
-
 scriptencoding iso-8859-9
 
 " Top
-menutrans &File				&Dosya
-menutrans &Edit				Dü&zen
-menutrans &Tools			&Araçlar
-menutrans &Syntax			&Sözdizim
-menutrans &Buffers			A&rabellekler
-menutrans &Window			&Pencere
-menutrans &Help				&Yardım
-
+menutrans &File		&Dosya
+menutrans &Edit		D�&zen
+menutrans &Tools	&Ara�lar
+menutrans &Syntax	&S�zdizim
+menutrans &Buffers	A&rabellekler
+menutrans &Window	&Pencere
+menutrans &Help		&Yard�m
 
 " Help menu
-menutrans &Overview<Tab><F1>	&Genel\ Bakış<Tab><F1>
-menutrans &User\ Manual			&Kullanım\ Kılavuzu
-menutrans &How-To\ Links		&Nasıl\ Yapılır?
-menutrans &Find\.\.\.			&Bul\.\.\.
+menutrans &Overview<Tab><F1>	&Genel\ Bak��<Tab><F1>
+menutrans &User\ Manual		&Kullan�m\ K�lavuzu
+menutrans &How-To\ Links	&Nas�l\ Yap�l�r?
+menutrans &Find\.\.\.		&Bul\.\.\.
 "--------------------
-menutrans &Credits			    &Teşekkürler
-menutrans Co&pying			    &Dağıtım
-menutrans &Sponsor/Register		&Sponsorluk/Kayıt
-menutrans O&rphans			    &Yetimler
+menutrans &Credits		&Te�ekk�rler
+menutrans Co&pying		&Da��t�m
+menutrans &Sponsor/Register	&Sponsorluk/Kay�t
+menutrans O&rphans		&Yetimler
 "--------------------
-menutrans &Version			    Sürüm\ &Bilgisi
-menutrans &About			    &Hakkında
-
+menutrans &Version	S�r�m\ &Bilgisi
+menutrans &About	&Hakk�nda
 
 " File menu
-menutrans &Open\.\.\.<Tab>:e		    &Aç\.\.\.<Tab>:e
-menutrans Sp&lit-Open\.\.\.<Tab>:sp	    &Yeni\ Bölümde\ Aç\.\.\.<Tab>:sp
-menutrans Open\ Tab\.\.\.<Tab>:tabnew	S&ekme\ Aç\.\.\.<Tab>:tabnew
-menutrans &New<Tab>:enew		        Yeni\ &Sekme<Tab>:enew
-menutrans &Close<Tab>:close		        Ka&pat<Tab>:close
+menutrans &Open\.\.\.<Tab>:e		&A�\.\.\.<Tab>:e
+menutrans Sp&lit-Open\.\.\.<Tab>:sp	&Yeni\ B�l�mde\ A�\.\.\.<Tab>:sp
+menutrans Open\ Tab\.\.\.<Tab>:tabnew	S&ekme\ A�\.\.\.<Tab>:tabnew
+menutrans &New<Tab>:enew		Yeni\ &Sekme<Tab>:enew
+menutrans &Close<Tab>:close		Ka&pat<Tab>:close
 "--------------------
-menutrans &Save<Tab>:w			        Ka&ydet<Tab>:w
-menutrans Save\ &As\.\.\.<Tab>:sav	    &Farklı Kaydet\.\.\.<Tab>:sav
+menutrans &Save<Tab>:w			Kayde&t<Tab>:w
+menutrans Save\ &As\.\.\.<Tab>:sav	&Farkl� Kaydet\.\.\.<Tab>:sav
 "--------------------
-menutrans Split\ &Diff\ With\.\.\.	    Ka&rşılaştır\.\.\.
-menutrans Split\ Patched\ &By\.\.\.	    Ya&malar\ Dahil\ Karşılaştır\.\.\.
+menutrans Split\ &Diff\ With\.\.\.	Ka&r��la�t�r\.\.\.
+menutrans Split\ Patched\ &By\.\.\.	Ya&malar\ Dahil\ Kar��la�t�r\.\.\.
 "--------------------
-menutrans &Print			            Ya&zdır
-menutrans Sa&ve-Exit<Tab>:wqa		    Kaydet\ &ve Çık<Tab>:wqa
-menutrans E&xit<Tab>:qa			        Çı&k<Tab>:qa
-
+menutrans &Print		Ya&zd�r
+menutrans Sa&ve-Exit<Tab>:wqa	Kaydet\ &ve ��k<Tab>:wqa
+menutrans E&xit<Tab>:qa		��&k<Tab>:qa
 
 " Edit menu
-menutrans &Undo<Tab>u			&Geri\ Al<Tab>u
-menutrans &Redo<Tab>^R			&Yinele<Tab>^R
-menutrans Rep&eat<Tab>\.		Son\ Komutu\ Y&inele<Tab>\.
+menutrans &Undo<Tab>u		&Geri\ Al<Tab>u
+menutrans &Redo<Tab>^R		&Yinele<Tab>^R
+menutrans Rep&eat<Tab>\.	Son\ Komutu\ Y&inele<Tab>\.
 "--------------------
-menutrans Cu&t<Tab>"+x			&Kes<Tab>"+x
-menutrans &Copy<Tab>"+y			K&opyala<Tab>"+y
-menutrans &Paste<Tab>"+gP		Ya&pıştır<Tab>"+gP
-menutrans Put\ &Before<Tab>[p	Ö&nüne Koy<Tab>[p
-menutrans Put\ &After<Tab>]p	A&rkasına Koy<Tab>]p
-menutrans &Delete<Tab>x			Si&l<Tab>x
-menutrans &Select\ All<Tab>ggVG	Tü&münü\ Seç<Tab>ggVG
+menutrans Cu&t<Tab>"+x		&Kes<Tab>"+x
+menutrans &Copy<Tab>"+y		K&opyala<Tab>"+y
+menutrans &Paste<Tab>"+gP	Ya&p��t�r<Tab>"+gP
+menutrans Put\ &Before<Tab>[p	�&n�ne Koy<Tab>[p
+menutrans Put\ &After<Tab>]p	A&rkas�na Koy<Tab>]p
+menutrans &Delete<Tab>x		Si&l<Tab>x
+menutrans &Select\ All<Tab>ggVG	T�&m�n�\ Se�<Tab>ggVG
 "--------------------
 " Athena GUI only
-menutrans &Find<Tab>/			            &Bul<Tab>/
-menutrans Find\ and\ Rep&lace<Tab>:%s	    Bul\ &ve\ Değiştir<Tab>:%s
+menutrans &Find<Tab>/			&Bul<Tab>/
+menutrans Find\ and\ Rep&lace<Tab>:%s	Bul\ &ve\ De�i�tir<Tab>:%s
 " End Athena GUI only
-menutrans &Find\.\.\.<Tab>/		            &Bul\.\.\.<Tab>/
-menutrans Find\ and\ Rep&lace\.\.\.	        Bul\ ve\ &Değiştir\.\.\.
-menutrans Find\ and\ Rep&lace\.\.\.<Tab>:%s	Bul\ ve\ &Değiştir\.\.\.<Tab>:%s
-menutrans Find\ and\ Rep&lace\.\.\.<Tab>:s	Bul\ ve\ &Değiştir\.\.\.<Tab>:s
+menutrans &Find\.\.\.<Tab>/		&Bul\.\.\.<Tab>/
+menutrans Find\ and\ Rep&lace\.\.\.	Bul\ ve\ &De�i�tir\.\.\.
+menutrans Find\ and\ Rep&lace\.\.\.<Tab>:%s	Bul\ ve\ &De�i�tir\.\.\.<Tab>:%s
+menutrans Find\ and\ Rep&lace\.\.\.<Tab>:s	Bul\ ve\ &De�i�tir\.\.\.<Tab>:s
 "--------------------
-menutrans Settings\ &Window		&Ayarlar\ Penceresi
-menutrans Startup\ &Settings	Başlan&gıç\ Ayarları
-menutrans &Global\ Settings		Ge&nel\ Ayarlar
-menutrans F&ile\ Settings		&Dosya\ Ayarları
-menutrans C&olor\ Scheme		&Renk\ Düzeni
-menutrans &Keymap			    Düğme\ &Eşlem
-menutrans Select\ Fo&nt\.\.\.	Ya&zıtipi Seç\.\.\.
+menutrans Settings\ &Window	&Ayarlar\ Penceresi
+menutrans Startup\ &Settings	Ba�lan&g��\ Ayarlar�
+menutrans &Global\ Settings	Ge&nel\ Ayarlar
+menutrans F&ile\ Settings	&Dosya\ Ayarlar�
+menutrans C&olor\ Scheme	&Renk\ D�zeni
+menutrans &Keymap		D��me\ &E�lem
+menutrans Select\ Fo&nt\.\.\.	Ya&z�tipi Se�\.\.\.
+
 ">>>----------------- Edit/Global settings
-menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!        Dizgi\ &Vurgulamasını\ Aç/Kapat<Tab>:set\ hls!
-menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic!		        BÜYÜK/küçük\ Harf\ &Duyarsız\ Aç/Kapat<Tab>:set\ ic!
-menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!	Eş&leşen\ İkilileri\ Aç/Kapat<Tab>:set\ sm!
-menutrans &Context\ Lines				                    İ&mleçle\ Oynayan\ Satırlar
-menutrans &Virtual\ Edit				                    &Sanal\ Düzenleme
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!		        Ekleme\ &Kipini\ Aç/Kapat<Tab>:set\ im!
-menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!		    &Vi\ Uyumlu\ Kipi\ Aç/Kapat<Tab>:set\ cp!
-menutrans Search\ &Path\.\.\.				                &Arama\ Yolu\.\.\.
-menutrans Ta&g\ Files\.\.\.				                    &Etiket\ Dosyaları\.\.\.
-"
-menutrans Toggle\ &Toolbar				    &Araç\ Çubuğunu\ Aç/Kapat
-menutrans Toggle\ &Bottom\ Scrollbar		A&lt\ Kaydırma\ Çubuğunu\ Aç/Kapat
-menutrans Toggle\ &Left\ Scrollbar			&Sol\ Kaydırma\ Çubuğunu\ Aç/Kapat
-menutrans Toggle\ &Right\ Scrollbar		    S&ağ\ Kaydırma\ Çubuğunu\ Aç/Kapat  	
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!		Dizgi\ &Vurgulamas�n�\ A�/Kapat<Tab>:set\ hls!
+menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic!		 	B�Y�K/k���k\ Harf\ &Duyarl�\ A�/Kapat<Tab>:set\ ic!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!	E�&le�en\ �kilileri\ A�/Kapat<Tab>:set\ sm!
+menutrans &Context\ Lines					�&mle�le\ Oynayan\ Sat�rlar
+menutrans &Virtual\ Edit					&Sanal\ D�zenleme
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!			Ekleme\ &Kipini\ A�/Kapat<Tab>:set\ im!
+menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!		&Vi\ Uyumlu\ Kipi\ A�/Kapat<Tab>:set\ cp!
+menutrans Search\ &Path\.\.\.					&Arama\ Yolu\.\.\.
+menutrans Ta&g\ Files\.\.\.					&Etiket\ Dosyalar�\.\.\.
+"
+menutrans Toggle\ &Toolbar		&Ara�\ �ubu�unu\ A�/Kapat
+menutrans Toggle\ &Bottom\ Scrollbar	A&lt\ Kayd�rma\ �ubu�unu\ A�/Kapat
+menutrans Toggle\ &Left\ Scrollbar	&Sol\ Kayd�rma\ �ubu�unu\ A�/Kapat
+menutrans Toggle\ &Right\ Scrollbar	S&a�\ Kayd�rma\ �ubu�unu\ A�/Kapat
+
 ">>>->>>------------- Edit/Global settings/Virtual edit
-menutrans Never					Kapalı
-menutrans Block\ Selection		Blok\ Seçimi
-menutrans Insert\ Mode			Ekleme\ Kipi
-menutrans Block\ and\ Insert	Blok\ Seçiminde\ ve\ Ekleme\ Kipinde
-menutrans Always				Her\ Zaman\ Açık
+menutrans Never			Kapal�
+menutrans Block\ Selection	Blok\ Se�imi
+menutrans Insert\ Mode		Ekleme\ Kipi
+menutrans Block\ and\ Insert	Blok\ Se�iminde\ ve\ Ekleme\ Kipinde
+menutrans Always				Her\ Zaman\ A��k
 ">>>----------------- Edit/File settings
-menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	        &Satır\ Numaralandırmayı\ Aç/Kapat<Tab>:set\ nu!
-menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!	&Göreceli\ Satır\ Numaralandırmayı\ Aç/Kapat<Tab>:set\ nru!
-menutrans Toggle\ &List\ Mode<Tab>:set\ list!		        Gö&rünmeyen\ Karakterleri\ Aç/Kapat<Tab>:set\ list!
-menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap!	        Sa&tır\ Kaydırmayı\ Aç/Kapat<Tab>:set\ wrap!
-menutrans Toggle\ W&rapping\ at\ Word<Tab>:set\ lbr!	    Sö&zcük\ Kaydırmayı\ Aç/Kapat<Tab>:set\ lbr!
-menutrans Toggle\ Tab\ &Expanding-tab<Tab>:set\ et!	        S&ekmeleri\ Boşluklara\ Dönüştürmeyi\ Aç/Kapat<Tab>:set\ et!
-menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai!	        &Otomatik\ Girintilemeyi\ Aç/Kapat<Tab>:set\ ai!
-menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin!	    &C\ Tarzı\ Girintilemeyi\ Aç/Kapat<Tab>:set\ cin!
+menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!		&Sat�r\ Numaraland�rmay�\ A�/Kapat<Tab>:set\ nu!
+menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!	&G�receli\ Sat�r\ Numaraland�rmay�\ A�/Kapat<Tab>:set\ nru!
+menutrans Toggle\ &List\ Mode<Tab>:set\ list!			G�&r�nmeyen\ Karakterleri\ A�/Kapat<Tab>:set\ list!
+menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap!		Sa&t�r\ Kayd�rmay�\ A�/Kapat<Tab>:set\ wrap!
+menutrans Toggle\ W&rapping\ at\ Word<Tab>:set\ lbr!		S�&zc�k\ Kayd�rmay�\ A�/Kapat<Tab>:set\ lbr!
+menutrans Toggle\ Tab\ &Expanding-tab<Tab>:set\ et!		S&ekmeleri\ Bo�luklara\ D�n��t�rmeyi\ A�/Kapat<Tab>:set\ et!
+menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai!		&Otomatik\ Girintilemeyi\ A�/Kapat<Tab>:set\ ai!
+menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin!		&C\ Tarz�\ Girintilemeyi\ A�/Kapat<Tab>:set\ cin!
 ">>>---
-menutrans &Shiftwidth			&Girinti\ Düzeyi
-menutrans Soft\ &Tabstop		&Sekme\ Genişliği
-menutrans Te&xt\ Width\.\.\.	&Metin\ Genişliği\.\.\.
-menutrans &File\ Format\.\.\.	&Dosya\ Biçimi\.\.\.
-"
-"
-"
+menutrans &Shiftwidth		&Girinti\ D�zeyi
+menutrans Soft\ &Tabstop	&Sekme\ Geni�li�i
+menutrans Te&xt\ Width\.\.\.	&Metin\ Geni�li�i\.\.\.
+menutrans &File\ Format\.\.\.	&Dosya\ Bi�imi\.\.\.
+
 " Tools menu
-menutrans &Jump\ to\ This\ Tag<Tab>g^]		Ş&u\ Etikete\ Atla<Tab>g^]
-menutrans Jump\ &Back<Tab>^T				&Geri\ Dön<Tab>^T
-menutrans Build\ &Tags\ File				&Etiket\ Dosyası\ Oluştur
+menutrans &Jump\ to\ This\ Tag<Tab>g^]	�&u\ Etikete\ Atla<Tab>g^]
+menutrans Jump\ &Back<Tab>^T		&Geri\ D�n<Tab>^T
+menutrans Build\ &Tags\ File		&Etiket\ Dosyas�\ Olu�tur
 "-------------------
-menutrans &Folding					&Kıvırmalar
-menutrans &Spelling					&Yazım\ Denetimi
-menutrans &Diff						&Ayrımlar\ (diff)
+menutrans &Folding	&K�v�rmalar
+menutrans &Spelling	&Yaz�m\ Denetimi
+menutrans &Diff		&Ayr�mlar\ (diff)
 "-------------------
-menutrans &Make<Tab>:make						&Derle<Tab>:make
-menutrans &List\ Errors<Tab>:cl					&Hataları\ Listele<Tab>:cl
-menutrans L&ist\ Messages<Tab>:cl!				Ä°&letileri\ Listele<Tab>:cl!
-menutrans &Next\ Error<Tab>:cn					Bir\ &Sonraki\ Hata<Tab>:cn
-menutrans &Previous\ Error<Tab>:cp				Bir\ Ö&nceki\ Hata<Tab>:cp
-menutrans &Older\ List<Tab>:cold				Daha\ &Eski\ Hatalar<Tab>:cold
-menutrans N&ewer\ List<Tab>:cnew				Daha\ &Yeni\ Hatalar<Tab>:cnew
-menutrans Error\ &Window						Hatalar\ &Penceresi
-menutrans Se&t\ Compiler						De&rleyici\ Seç
-menutrans Show\ Compiler\ Se&ttings\ in\ Menu	Derleyici\ Ayarlarını\ Menüde\ &Göster 
+menutrans &Make<Tab>:make			&Derle<Tab>:make
+menutrans &List\ Errors<Tab>:cl			&Hatalar�\ Listele<Tab>:cl
+menutrans L&ist\ Messages<Tab>:cl!		�&letileri\ Listele<Tab>:cl!
+menutrans &Next\ Error<Tab>:cn			Bir\ &Sonraki\ Hata<Tab>:cn
+menutrans &Previous\ Error<Tab>:cp		Bir\ �&nceki\ Hata<Tab>:cp
+menutrans &Older\ List<Tab>:cold		Daha\ &Eski\ Hatalar<Tab>:cold
+menutrans N&ewer\ List<Tab>:cnew		Daha\ &Yeni\ Hatalar<Tab>:cnew
+menutrans Error\ &Window			Hatalar\ &Penceresi
+menutrans Se&t\ Compiler			De&rleyici\ Se�
+menutrans Show\ Compiler\ Se&ttings\ in\ Menu	Derleyici\ Ayarlar�n�\ Men�de\ &G�ster 
 "-------------------
-menutrans &Convert\ to\ HEX<Tab>:%!xxd			HEX'e\ Dö&nüştür<Tab>:%!xxd
-menutrans Conve&rt\ Back<Tab>:%!xxd\ -r			HEX'&ten\ Dönüştür<Tab>:%!xxd\ -r
+menutrans &Convert\ to\ HEX<Tab>:%!xxd		HEX'e\ D�&n��t�r<Tab>:%!xxd
+menutrans Conve&rt\ Back<Tab>:%!xxd\ -r		HEX'&ten\ D�n��t�r<Tab>:%!xxd\ -r
 ">>>---------------- Tools/Spelling
-menutrans &Spell\ Check\ On						Yazım\ Denetimini\ &Aç
-menutrans Spell\ Check\ &Off					Yazım\ Denetimini\ &Kapat
-menutrans To\ &Next\ Error<Tab>]s				Bir\ &Sonraki\ Hata<Tab>]s
-menutrans To\ &Previous\ Error<Tab>[s			Bir\ Ö&nceki\ Hata<Tab>[s
-menutrans Suggest\ &Corrections<Tab>z=			Dü&zeltme\ Öner<Tab>z=
-menutrans &Repeat\ Correction<Tab>:spellrepall	Düzeltmeyi\ &Yinele<Tab>spellrepall
+menutrans &Spell\ Check\ On			Yaz�m\ Denetimini\ &A�
+menutrans Spell\ Check\ &Off			Yaz�m\ Denetimini\ &Kapat
+menutrans To\ &Next\ Error<Tab>]s		Bir\ &Sonraki\ Hata<Tab>]s
+menutrans To\ &Previous\ Error<Tab>[s		Bir\ �&nceki\ Hata<Tab>[s
+menutrans Suggest\ &Corrections<Tab>z=		D�&zeltme\ �ner<Tab>z=
+menutrans &Repeat\ Correction<Tab>:spellrepall	D�zeltmeyi\ &Yinele<Tab>spellrepall
 "-------------------
-menutrans Set\ Language\ to\ "en"		Dili\ "en"\ yap
+menutrans Set\ Language\ to\ "en"	Dili\ "en"\ yap
 menutrans Set\ Language\ to\ "en_au"	Dili\ "en_au"\ yap
 menutrans Set\ Language\ to\ "en_ca"	Dili\ "en_ca"\ yap
 menutrans Set\ Language\ to\ "en_gb"	Dili\ "en_gb"\ yap
 menutrans Set\ Language\ to\ "en_nz"	Dili\ "en_nz"\ yap
 menutrans Set\ Language\ to\ "en_us"	Dili\ "en_us"\ yap
-menutrans &Find\ More\ Languages		&Başka\ Diller\ Bul
-let g:menutrans_set_lang_to =			'Dil Yükle'
-"
-"
+menutrans &Find\ More\ Languages	&Ba�ka\ Diller\ Bul
+let g:menutrans_set_lang_to =		'Dil Y�kle'
+
 " The Spelling popup menu
-"
-"
-let g:menutrans_spell_change_ARG_to =			'Düzeltilecek:\ "%s"\ ->'
-let g:menutrans_spell_add_ARG_to_word_list =	'"%s"\ sözcüğünü\ sözlüğe\ ekle'
-let g:menutrans_spell_ignore_ARG =				'"%s"\ sözcüğünü\ yoksay'
+let g:menutrans_spell_change_ARG_to =		'D�zeltilecek:\ "%s"\ ->'
+let g:menutrans_spell_add_ARG_to_word_list =	'"%s"\ s�zc���n�\ s�zl��e\ ekle'
+let g:menutrans_spell_ignore_ARG =		'"%s"\ s�zc���n�\ yoksay'
 ">>>---------------- Folds
-menutrans &Enable/Disable\ Folds<Tab>zi			&Kıvırmaları\ Aç/Kapat<Tab>zi
-menutrans &View\ Cursor\ Line<Tab>zv			İ&mlecin\ Olduğu\ Satırı\ Görüntüle<Tab>zv
-menutrans Vie&w\ Cursor\ Line\ Only<Tab>zMzx	Ya&lnızca\ İmlecin\ Olduğu\ Satırı\ Görüntüle<Tab>zMzx
-menutrans C&lose\ More\ Folds<Tab>zm			&Daha\ Fazla\ Kıvırma\ Kapat<Tab>zm
-menutrans &Close\ All\ Folds<Tab>zM				Bütün\ Kı&vırmaları\ Kapat<Tab>zM
-menutrans &Open\ All\ Folds<Tab>zR				Bü&tün\ Kıvırmaları\ Aç<Tab>zR
-menutrans O&pen\ More\ Folds<Tab>zr				D&aha\ Fazla\ Kıvırma\ Aç<Tab>zr
-menutrans Fold\ Met&hod							Kıvı&rma\ Yöntemi
-menutrans Create\ &Fold<Tab>zf					Kıvırma\ &Oluştur<Tab>zf
-menutrans &Delete\ Fold<Tab>zd					Kıvırma\ &Sil<Tab>zd
-menutrans Delete\ &All\ Folds<Tab>zD			Tü&m\ Kıvırmaları\ Sil<Tab>zD
-menutrans Fold\ col&umn\ Width					Kıvırma\ Sütunu\ &Genişliği
+menutrans &Enable/Disable\ Folds<Tab>zi		&K�v�rmalar�\ A�/Kapat<Tab>zi
+menutrans &View\ Cursor\ Line<Tab>zv		�&mlecin\ Oldu�u\ Sat�r�\ G�r�nt�le<Tab>zv
+menutrans Vie&w\ Cursor\ Line\ Only<Tab>zMzx	Ya&ln�zca\ �mlecin\ Oldu�u\ Sat�r�\ G�r�nt�le<Tab>zMzx
+menutrans C&lose\ More\ Folds<Tab>zm		&Daha\ Fazla\ K�v�rma\ Kapat<Tab>zm
+menutrans &Close\ All\ Folds<Tab>zM		B�t�n\ K�&v�rmalar�\ Kapat<Tab>zM
+menutrans &Open\ All\ Folds<Tab>zR		B�&t�n\ K�v�rmalar�\ A�<Tab>zR
+menutrans O&pen\ More\ Folds<Tab>zr		D&aha\ Fazla\ K�v�rma\ A�<Tab>zr
+menutrans Fold\ Met&hod				K�v�&rma\ Y�ntemi
+menutrans Create\ &Fold<Tab>zf			K�v�rma\ &Olu�tur<Tab>zf
+menutrans &Delete\ Fold<Tab>zd			K�v�rma\ &Sil<Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD		T�&m\ K�v�rmalar�\ Sil<Tab>zD
+menutrans Fold\ col&umn\ Width			K�v�rma\ S�tunu\ &Geni�li�i
 ">>>->>>----------- Tools/Folds/Fold Method
-menutrans M&anual		&El\ Ä°le
-menutrans I&ndent		&Girinti
-menutrans E&xpression	Ä°&fade
-menutrans S&yntax		&Sözdizim
-menutrans Ma&rker		Ä°&mleyici
+menutrans M&anual	&El\ �le
+menutrans I&ndent	&Girinti
+menutrans E&xpression	�&fade
+menutrans S&yntax	&S�zdizim
+menutrans Ma&rker	�&mleyici
 ">>>--------------- Tools/Diff
-menutrans &Update		&Güncelle
-menutrans &Get\ Block	Bloğu\ &Al
-menutrans &Put\ Block	Bloğu\ &Koy
+menutrans &Update	&G�ncelle
+menutrans &Get\ Block	Blo�u\ &Al
+menutrans &Put\ Block	Blo�u\ &Koy
 ">>>--------------- Tools/Diff/Error window
-menutrans &Update<Tab>:cwin		&Güncelle<Tab>:cwin
+menutrans &Update<Tab>:cwin	&G�ncelle<Tab>:cwin
 menutrans &Close<Tab>:cclose	&Kapat<Tab>:cclose
-menutrans &Open<Tab>:copen		&Aç<Tab>:copen
-"
-"
+menutrans &Open<Tab>:copen	&A�<Tab>:copen
+
 " Syntax menu
-"
-menutrans &Show\ File\ Types\ in\ Menu		Dosya\ Türlerini\ Menüde\ &Göster
-menutrans Set\ '&syntax'\ only				Yalnızca\ 'syntax'\ &Ayarla
-menutrans Set\ '&filetype'\ too				'filetype'\ İçin\ &de\ Ayarla
-menutrans &Off								&Kapat
-menutrans &Manual							&El\ Ä°le
-menutrans A&utomatic						&Otomatik
-menutrans On/Off\ for\ &This\ File			&Bu\ Dosya\ İçin\ Aç/Kapat
-menutrans Co&lor\ Test						&Renk\ Testi
-menutrans &Highlight\ Test					&Vurgulama\ Testi
-menutrans &Convert\ to\ HTML				&HTML'ye\ Dönüştür
-"
-"
+menutrans &Show\ File\ Types\ in\ Menu	Dosya\ T�rlerini\ Men�de\ &G�ster
+menutrans Set\ '&syntax'\ only		Yaln�zca\ 'syntax'\ &Ayarla
+menutrans Set\ '&filetype'\ too		'filetype'\ ��in\ &de\ Ayarla
+menutrans &Off				&Kapat
+menutrans &Manual			&El\ �le
+menutrans A&utomatic			&Otomatik
+menutrans On/Off\ for\ &This\ File	&Bu\ Dosya\ ��in\ A�/Kapat
+menutrans Co&lor\ Test			&Renk\ Testi
+menutrans &Highlight\ Test		&Vurgulama\ Testi
+menutrans &Convert\ to\ HTML		&HTML'ye\ D�n��t�r
+
 " Buffers menu
-"
-menutrans &Refresh\ menu	&Menüyü\ Güncelle
-menutrans Delete			&Sil
-menutrans &Alternate		Ö&teki
-menutrans &Next				So&nraki
-menutrans &Previous			Ön&ceki
+menutrans &Refresh\ menu	&Men�y�\ G�ncelle
+menutrans Delete		&Sil
+menutrans &Alternate		�&teki
+menutrans &Next			So&nraki
+menutrans &Previous		�n&ceki
 menutrans [No\ File]		[Dosya\ Yok]
-"
-"
+
 " Window menu
-"
-menutrans &New<Tab>^Wn					Yeni\ &Pencere<Tab>^Wn
-menutrans S&plit<Tab>^Ws				Pencereyi\ &Böl<Tab>^Ws
-menutrans Sp&lit\ To\ #<Tab>^W^^		Pencereyi\ Başkasına\ Bö&l<Tab>^W^^
-menutrans Split\ &Vertically<Tab>^Wv	Pencereyi\ &Dikey\ Olarak\ Böl<Tab>^Wv
-menutrans Split\ File\ E&xplorer		Yeni\ Bölü&mde\ Dosya\ Gezginini\ Aç
-"
-menutrans &Close<Tab>^Wc				Pen&cereyi\ Kapat<Tab>^Wc
-menutrans Close\ &Other(s)<Tab>^Wo		Diğer\ Pencerele&ri\ Kapat<Tab>^Wo
-"
-menutrans Move\ &To						&Taşı
-menutrans Rotate\ &Up<Tab>^WR			&Yukarı\ Taşı<Tab>^WR
-menutrans Rotate\ &Down<Tab>^Wr			&Aşağı\ Taşı<Tab>^Wr
-"
-menutrans &Equal\ Size<Tab>^W=			&Eşit\ Boyut<Tab>^W=
-menutrans &Max\ Height<Tab>^W_			E&n\ Büyük\ Yükseklik<Tab>^W_
-menutrans M&in\ Height<Tab>^W1_			En\ Küçük\ Yüksekl&ik<Tab>^W1_
-menutrans Max\ &Width<Tab>^W\|			En\ Büyük\ Gen&işlik<Tab>^W\|
-menutrans Min\ Widt&h<Tab>^W1\|			En\ Küçük\ Geniş&lik<Tab>^W1\|
+menutrans &New<Tab>^Wn			Yeni\ &Pencere<Tab>^Wn
+menutrans S&plit<Tab>^Ws		Pencereyi\ &B�l<Tab>^Ws
+menutrans Sp&lit\ To\ #<Tab>^W^^	Pencereyi\ Ba�kas�na\ B�&l<Tab>^W^^
+menutrans Split\ &Vertically<Tab>^Wv	Pencereyi\ &Dikey\ Olarak\ B�l<Tab>^Wv
+menutrans Split\ File\ E&xplorer	Yeni\ B�l�&mde\ Dosya\ Gezginini\ A�
+"
+menutrans &Close<Tab>^Wc		Pen&cereyi\ Kapat<Tab>^Wc
+menutrans Close\ &Other(s)<Tab>^Wo	Di�er\ Pencerele&ri\ Kapat<Tab>^Wo
+"
+menutrans Move\ &To		&Ta��
+menutrans Rotate\ &Up<Tab>^WR	&Yukar�\ Ta��<Tab>^WR
+menutrans Rotate\ &Down<Tab>^Wr	&A�a��\ Ta��<Tab>^Wr
+"
+menutrans &Equal\ Size<Tab>^W=	&E�it\ Boyut<Tab>^W=
+menutrans &Max\ Height<Tab>^W_	E&n\ B�y�k\ Y�kseklik<Tab>^W_
+menutrans M&in\ Height<Tab>^W1_	En\ K���k\ Y�ksekl&ik<Tab>^W1_
+menutrans Max\ &Width<Tab>^W\|	En\ B�y�k\ Gen&i�lik<Tab>^W\|
+menutrans Min\ Widt&h<Tab>^W1\|	En\ K���k\ Geni�li&k<Tab>^W1\|
+
 ">>>----------------- Window/Move To
-menutrans &Top<Tab>^WK					&Yukarı<Tab>^WK
-menutrans &Bottom<Tab>^WJ				&Aşağı<Tab>^WJ
-menutrans &Left\ Side<Tab>^WH			So&la<Tab>^WH
-menutrans &Right\ Side<Tab>^WL			&Sağa<Tab>^WL
-"
-"
+menutrans &Top<Tab>^WK		&Yukar�<Tab>^WK
+menutrans &Bottom<Tab>^WJ	&A�a��<Tab>^WJ
+menutrans &Left\ Side<Tab>^WH	So&la<Tab>^WH
+menutrans &Right\ Side<Tab>^WL	&Sa�a<Tab>^WL
+
 " The popup menu
-"
-"
-menutrans &Undo					&Geri\ Al
-menutrans Cu&t					&Kes
-menutrans &Copy					K&opyala
-menutrans &Paste				&Yapıştır
-menutrans &Delete				&Sil
-menutrans Select\ Blockwise		&Blok\ Biçiminde\ Seç
-menutrans Select\ &Word			Sö&zcük\ Seç
-menutrans Select\ &Sentence		&Tümce\ Seç
-menutrans Select\ Pa&ragraph	&Paragraf\ Seç
-menutrans Select\ &Line			S&atır\ Seç
-menutrans Select\ &Block		Bl&ok\ Seç
-menutrans Select\ &All			Tümü&nü\ Seç
-"
+menutrans &Undo			&Geri\ Al
+menutrans Cu&t			&Kes
+menutrans &Copy			K&opyala
+menutrans &Paste		&Yap��t�r
+menutrans &Delete		&Sil
+menutrans Select\ Blockwise	&Blok\ Bi�iminde\ Se�
+menutrans Select\ &Word		S�&zc�k\ Se�
+menutrans Select\ &Sentence	&T�mce\ Se�
+menutrans Select\ Pa&ragraph	&Paragraf\ Se�
+menutrans Select\ &Line		S&at�r\ Se�
+menutrans Select\ &Block	Bl&ok\ Se�
+menutrans Select\ &All		T�m�&n�\ Se�
+
 " The GUI toolbar
-"
 if has("toolbar")
-  if exists("*Do_toolbar_tmenu")
-    delfun Do_toolbar_tmenu
-  endif
-  fun Do_toolbar_tmenu()
-    tmenu ToolBar.Open			Dosya Aç
-    tmenu ToolBar.Save			Dosya Kaydet
-    tmenu ToolBar.SaveAll		Tüm Dosyaları Kaydet
-    tmenu ToolBar.Print			Yazdır
-    tmenu ToolBar.Undo			Geri Al
-    tmenu ToolBar.Redo			Yinele
-    tmenu ToolBar.Cut			Kes
-    tmenu ToolBar.Copy			Kopyala
-    tmenu ToolBar.Paste			Yapıştır
-	tmenu ToolBar.Find			Bul...
-    tmenu ToolBar.FindNext		Sonrakini Bul
-    tmenu ToolBar.FindPrev		Öncekini Bul
-    tmenu ToolBar.Replace		Bul ve Değiştir...
-    if 0	" disabled; These are in the Windows menu
-      tmenu ToolBar.New			Yeni Pencere
-      tmenu ToolBar.WinSplit	Pencereyi Böl
-      tmenu ToolBar.WinMax		En Büyük Pencere Yüksekliği
-      tmenu ToolBar.WinMin		En Küçük Pencere Yüksekliği
-      tmenu ToolBar.WinClose	Pencereyi Kapat
-    endif
-    tmenu ToolBar.LoadSesn		Oturum Yükle
-    tmenu ToolBar.SaveSesn		Oturum Kaydet
-    tmenu ToolBar.RunScript		Betik Çalıştır
-    tmenu ToolBar.Make			Derle
-    tmenu ToolBar.Shell			Kabuk
-    tmenu ToolBar.RunCtags		Etiket Dosyası Oluştur
-    tmenu ToolBar.TagJump		Etikete Atla
-    tmenu ToolBar.Help			Yardım
-    tmenu ToolBar.FindHelp		Yardım Bul
-  endfun
+	if exists("*Do_toolbar_tmenu")
+		delfun Do_toolbar_tmenu
+	endif
+
+	fun Do_toolbar_tmenu()
+		tmenu ToolBar.Open	Dosya A�
+		tmenu ToolBar.Save	Dosya Kaydet
+		tmenu ToolBar.SaveAll	T�m Dosyalar� Kaydet
+		tmenu ToolBar.Print	Yazd�r
+		tmenu ToolBar.Undo	Geri Al
+		tmenu ToolBar.Redo	Yinele
+		tmenu ToolBar.Cut	Kes
+		tmenu ToolBar.Copy	Kopyala
+		tmenu ToolBar.Paste	Yap��t�r
+		tmenu ToolBar.Find	Bul...
+		tmenu ToolBar.FindNext	Sonrakini Bul
+		tmenu ToolBar.FindPrev	�ncekini Bul
+		tmenu ToolBar.Replace	Bul ve De�i�tir...
+		if 0	" disabled; These are in the Windows menu
+			tmenu ToolBar.New	Yeni Pencere
+			tmenu ToolBar.WinSplit	Pencereyi B�l
+			tmenu ToolBar.WinMax	En B�y�k Pencere Y�ksekli�i
+			tmenu ToolBar.WinMin	En K���k Pencere Y�ksekli�i
+			tmenu ToolBar.WinClose	Pencereyi Kapat
+		endif
+		tmenu ToolBar.LoadSesn	Oturum Y�kle
+		tmenu ToolBar.SaveSesn	Oturum Kaydet
+		tmenu ToolBar.RunScript	Betik �al��t�r
+		tmenu ToolBar.Make	Derle
+		tmenu ToolBar.Shell	Kabuk
+		tmenu ToolBar.RunCtags	Etiket Dosyas� Olu�tur
+		tmenu ToolBar.TagJump	Etikete Atla
+		tmenu ToolBar.Help	Yard�m
+		tmenu ToolBar.FindHelp	Yard�m Bul
+	endfun
 endif
-"
-"
+
 " Dialog texts
-"
 " Find in help dialog
-"
-let g:menutrans_help_dialog = "Yardım için komut veya sözcük girin:\n\nEkleme Kipi komutlarını aramak için i_ ekleyin (örneğin i_CTRL-X)\nNormal Kip komutlarını aramak için _c ekleyin (örneğin с_<Del>)\nSeçenekler hakkında yardım almak için ' ekleyin (örneğin 'shiftwidth')"
-"
+let g:menutrans_help_dialog = "Yard�m i�in komut veya s�zc�k girin:\n\nEkleme Kipi komutlar�n� aramak i�in i_ ekleyin (�rne�in i_CTRL-X)\nNormal Kip komutlar�n� aramak i�in _c ekleyin (�rne�in c_<Del>)\nSe�enekler hakk�nda yard�m almak i�in ' ekleyin (�rne�in 'shiftwidth')"
+
 " Searh path dialog
-"
-let g:menutrans_path_dialog = "Dosya araması için yol belirtin.\nDizin adları virgüllerle ayrılır."
-"
+let g:menutrans_path_dialog = "Dosya aramas� i�in yol belirtin.\nDizin adlar� virg�llerle ayr�l�r."
+
 " Tag files dialog
-"
-let g:menutrans_tags_dialog = "Etiket dosyası adları belirtin (virgülle ayırarak).\n"
-"
+let g:menutrans_tags_dialog = "Etiket dosyas� adlar� belirtin (virg�lle ay�rarak).\n"
+
 " Text width dialog
-"
-let g:menutrans_textwidth_dialog = "Biçimlendirme için metin genişliğini belirtin.\nBiçimlendirme iptali için 0 girin."
-"
+let g:menutrans_textwidth_dialog = "Bi�imlendirme i�in metin geni�li�ini belirtin.\nBi�imlendirme iptali i�in 0 girin."
+
 " File format dialog
-"
-let g:menutrans_fileformat_dialog = "Dosya biçimi seçin"
-let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\nÄ°&ptal"
-"
+let g:menutrans_fileformat_dialog = "Dosya bi�imi se�in"
+let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n�&ptal"
 let menutrans_no_file = "[Dosya Yok]"
-
 let &cpo = s:keepcpo
 unlet s:keepcpo
diff --git a/runtime/lang/menu_tr_tr.utf-8.vim b/runtime/lang/menu_tr_tr.utf-8.vim
index 56c4c8b9e..a828acfc4 100644
--- a/runtime/lang/menu_tr_tr.utf-8.vim
+++ b/runtime/lang/menu_tr_tr.utf-8.vim
@@ -1,331 +1,308 @@
 " Menu Translations:	Turkish
-" Maintainer:			Emir SARI <bitigchi@me.com>
+" Maintainer:		Emir SARI <bitigchi@me.com>
 
 if exists("did_menu_trans")
    finish
 endif
+
 let did_menu_trans = 1
 let s:keepcpo= &cpo
 set cpo&vim
-
 scriptencoding utf-8
 
 " Top
-menutrans &File				&Dosya
-menutrans &Edit				Dü&zen
-menutrans &Tools			&Araçlar
-menutrans &Syntax			&Sözdizim
-menutrans &Buffers			A&rabellekler
-menutrans &Window			&Pencere
-menutrans &Help				&Yardım
-
+menutrans &File		&Dosya
+menutrans &Edit		Dü&zen
+menutrans &Tools	&Araçlar
+menutrans &Syntax	&Sözdizim
+menutrans &Buffers	A&rabellekler
+menutrans &Window	&Pencere
+menutrans &Help		&Yardım
 
 " Help menu
 menutrans &Overview<Tab><F1>	&Genel\ Bakış<Tab><F1>
-menutrans &User\ Manual			&Kullanım\ Kılavuzu
-menutrans &How-To\ Links		&Nasıl\ Yapılır?
-menutrans &Find\.\.\.			&Bul\.\.\.
+menutrans &User\ Manual		&Kullanım\ Kılavuzu
+menutrans &How-To\ Links	&Nasıl\ Yapılır?
+menutrans &Find\.\.\.		&Bul\.\.\.
 "--------------------
-menutrans &Credits			    &Teşekkürler
-menutrans Co&pying			    &Dağıtım
-menutrans &Sponsor/Register		&Sponsorluk/Kayıt
-menutrans O&rphans			    &Yetimler
+menutrans &Credits		&Teşekkürler
+menutrans Co&pying		&Dağıtım
+menutrans &Sponsor/Register	&Sponsorluk/Kayıt
+menutrans O&rphans		&Yetimler
 "--------------------
-menutrans &Version			    Sürüm\ &Bilgisi
-menutrans &About			    &Hakkında
-
+menutrans &Version	Sürüm\ &Bilgisi
+menutrans &About	&Hakkında
 
 " File menu
-menutrans &Open\.\.\.<Tab>:e		    &Aç\.\.\.<Tab>:e
-menutrans Sp&lit-Open\.\.\.<Tab>:sp	    &Yeni\ Bölümde\ Aç\.\.\.<Tab>:sp
+menutrans &Open\.\.\.<Tab>:e		&Aç\.\.\.<Tab>:e
+menutrans Sp&lit-Open\.\.\.<Tab>:sp	&Yeni\ Bölümde\ Aç\.\.\.<Tab>:sp
 menutrans Open\ Tab\.\.\.<Tab>:tabnew	S&ekme\ Aç\.\.\.<Tab>:tabnew
-menutrans &New<Tab>:enew		        Yeni\ &Sekme<Tab>:enew
-menutrans &Close<Tab>:close		        Ka&pat<Tab>:close
+menutrans &New<Tab>:enew		Yeni\ &Sekme<Tab>:enew
+menutrans &Close<Tab>:close		Ka&pat<Tab>:close
 "--------------------
-menutrans &Save<Tab>:w			        Kayde&t<Tab>:w
-menutrans Save\ &As\.\.\.<Tab>:sav	    &Farklı Kaydet\.\.\.<Tab>:sav
+menutrans &Save<Tab>:w			Kayde&t<Tab>:w
+menutrans Save\ &As\.\.\.<Tab>:sav	&Farklı Kaydet\.\.\.<Tab>:sav
 "--------------------
-menutrans Split\ &Diff\ With\.\.\.	    Ka&rşılaştır\.\.\.
-menutrans Split\ Patched\ &By\.\.\.	    Ya&malar\ Dahil\ Karşılaştır\.\.\.
+menutrans Split\ &Diff\ With\.\.\.	Ka&rşılaştır\.\.\.
+menutrans Split\ Patched\ &By\.\.\.	Ya&malar\ Dahil\ Karşılaştır\.\.\.
 "--------------------
-menutrans &Print			            Ya&zdır
-menutrans Sa&ve-Exit<Tab>:wqa		    Kaydet\ &ve Çık<Tab>:wqa
-menutrans E&xit<Tab>:qa			        Çı&k<Tab>:qa
-
+menutrans &Print		Ya&zdır
+menutrans Sa&ve-Exit<Tab>:wqa	Kaydet\ &ve Çık<Tab>:wqa
+menutrans E&xit<Tab>:qa		Çı&k<Tab>:qa
 
 " Edit menu
-menutrans &Undo<Tab>u			&Geri\ Al<Tab>u
-menutrans &Redo<Tab>^R			&Yinele<Tab>^R
-menutrans Rep&eat<Tab>\.		Son\ Komutu\ Y&inele<Tab>\.
+menutrans &Undo<Tab>u		&Geri\ Al<Tab>u
+menutrans &Redo<Tab>^R		&Yinele<Tab>^R
+menutrans Rep&eat<Tab>\.	Son\ Komutu\ Y&inele<Tab>\.
 "--------------------
-menutrans Cu&t<Tab>"+x			&Kes<Tab>"+x
-menutrans &Copy<Tab>"+y			K&opyala<Tab>"+y
-menutrans &Paste<Tab>"+gP		Ya&pıştır<Tab>"+gP
+menutrans Cu&t<Tab>"+x		&Kes<Tab>"+x
+menutrans &Copy<Tab>"+y		K&opyala<Tab>"+y
+menutrans &Paste<Tab>"+gP	Ya&pıştır<Tab>"+gP
 menutrans Put\ &Before<Tab>[p	Ö&nüne Koy<Tab>[p
 menutrans Put\ &After<Tab>]p	A&rkasına Koy<Tab>]p
-menutrans &Delete<Tab>x			Si&l<Tab>x
+menutrans &Delete<Tab>x		Si&l<Tab>x
 menutrans &Select\ All<Tab>ggVG	Tü&münü\ Seç<Tab>ggVG
 "--------------------
 " Athena GUI only
-menutrans &Find<Tab>/			            &Bul<Tab>/
-menutrans Find\ and\ Rep&lace<Tab>:%s	    Bul\ &ve\ Değiştir<Tab>:%s
+menutrans &Find<Tab>/			&Bul<Tab>/
+menutrans Find\ and\ Rep&lace<Tab>:%s	Bul\ &ve\ Değiştir<Tab>:%s
 " End Athena GUI only
-menutrans &Find\.\.\.<Tab>/		            &Bul\.\.\.<Tab>/
-menutrans Find\ and\ Rep&lace\.\.\.	        Bul\ ve\ &Değiştir\.\.\.
+menutrans &Find\.\.\.<Tab>/		&Bul\.\.\.<Tab>/
+menutrans Find\ and\ Rep&lace\.\.\.	Bul\ ve\ &Değiştir\.\.\.
 menutrans Find\ and\ Rep&lace\.\.\.<Tab>:%s	Bul\ ve\ &Değiştir\.\.\.<Tab>:%s
 menutrans Find\ and\ Rep&lace\.\.\.<Tab>:s	Bul\ ve\ &Değiştir\.\.\.<Tab>:s
 "--------------------
-menutrans Settings\ &Window		&Ayarlar\ Penceresi
+menutrans Settings\ &Window	&Ayarlar\ Penceresi
 menutrans Startup\ &Settings	Başlan&gıç\ Ayarları
-menutrans &Global\ Settings		Ge&nel\ Ayarlar
-menutrans F&ile\ Settings		&Dosya\ Ayarları
-menutrans C&olor\ Scheme		&Renk\ Düzeni
-menutrans &Keymap			    Düğme\ &Eşlem
+menutrans &Global\ Settings	Ge&nel\ Ayarlar
+menutrans F&ile\ Settings	&Dosya\ Ayarları
+menutrans C&olor\ Scheme	&Renk\ Düzeni
+menutrans &Keymap		Düğme\ &Eşlem
 menutrans Select\ Fo&nt\.\.\.	Ya&zıtipi Seç\.\.\.
+
 ">>>----------------- Edit/Global settings
-menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!        Dizgi\ &Vurgulamasını\ Aç/Kapat<Tab>:set\ hls!
-menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic!		        BÜYÜK/küçük\ Harf\ &Duyarlı\ Aç/Kapat<Tab>:set\ ic!
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!		Dizgi\ &Vurgulamasını\ Aç/Kapat<Tab>:set\ hls!
+menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic!		 	BÜYÜK/küçük\ Harf\ &Duyarlı\ Aç/Kapat<Tab>:set\ ic!
 menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!	Eş&leşen\ İkilileri\ Aç/Kapat<Tab>:set\ sm!
-menutrans &Context\ Lines				                    İ&mleçle\ Oynayan\ Satırlar
-menutrans &Virtual\ Edit				                    &Sanal\ Düzenleme
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!		        Ekleme\ &Kipini\ Aç/Kapat<Tab>:set\ im!
-menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!		    &Vi\ Uyumlu\ Kipi\ Aç/Kapat<Tab>:set\ cp!
-menutrans Search\ &Path\.\.\.				                &Arama\ Yolu\.\.\.
-menutrans Ta&g\ Files\.\.\.				                    &Etiket\ Dosyaları\.\.\.
-"
-menutrans Toggle\ &Toolbar				    &Araç\ Çubuğunu\ Aç/Kapat
-menutrans Toggle\ &Bottom\ Scrollbar		A&lt\ Kaydırma\ Çubuğunu\ Aç/Kapat
-menutrans Toggle\ &Left\ Scrollbar			&Sol\ Kaydırma\ Çubuğunu\ Aç/Kapat
-menutrans Toggle\ &Right\ Scrollbar		    S&ağ\ Kaydırma\ Çubuğunu\ Aç/Kapat  	
+menutrans &Context\ Lines					İ&mleçle\ Oynayan\ Satırlar
+menutrans &Virtual\ Edit					&Sanal\ Düzenleme
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!			Ekleme\ &Kipini\ Aç/Kapat<Tab>:set\ im!
+menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!		&Vi\ Uyumlu\ Kipi\ Aç/Kapat<Tab>:set\ cp!
+menutrans Search\ &Path\.\.\.					&Arama\ Yolu\.\.\.
+menutrans Ta&g\ Files\.\.\.					&Etiket\ Dosyaları\.\.\.
+"
+menutrans Toggle\ &Toolbar		&Araç\ Çubuğunu\ Aç/Kapat
+menutrans Toggle\ &Bottom\ Scrollbar	A&lt\ Kaydırma\ Çubuğunu\ Aç/Kapat
+menutrans Toggle\ &Left\ Scrollbar	&Sol\ Kaydırma\ Çubuğunu\ Aç/Kapat
+menutrans Toggle\ &Right\ Scrollbar	S&ağ\ Kaydırma\ Çubuğunu\ Aç/Kapat
+
 ">>>->>>------------- Edit/Global settings/Virtual edit
-menutrans Never					Kapalı
-menutrans Block\ Selection		Blok\ Seçimi
-menutrans Insert\ Mode			Ekleme\ Kipi
+menutrans Never			Kapalı
+menutrans Block\ Selection	Blok\ Seçimi
+menutrans Insert\ Mode		Ekleme\ Kipi
 menutrans Block\ and\ Insert	Blok\ Seçiminde\ ve\ Ekleme\ Kipinde
 menutrans Always				Her\ Zaman\ Açık
 ">>>----------------- Edit/File settings
-menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	        &Satır\ Numaralandırmayı\ Aç/Kapat<Tab>:set\ nu!
+menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!		&Satır\ Numaralandırmayı\ Aç/Kapat<Tab>:set\ nu!
 menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!	&Göreceli\ Satır\ Numaralandırmayı\ Aç/Kapat<Tab>:set\ nru!
-menutrans Toggle\ &List\ Mode<Tab>:set\ list!		        Gö&rünmeyen\ Karakterleri\ Aç/Kapat<Tab>:set\ list!
-menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap!	        Sa&tır\ Kaydırmayı\ Aç/Kapat<Tab>:set\ wrap!
-menutrans Toggle\ W&rapping\ at\ Word<Tab>:set\ lbr!	    Sö&zcük\ Kaydırmayı\ Aç/Kapat<Tab>:set\ lbr!
-menutrans Toggle\ Tab\ &Expanding-tab<Tab>:set\ et!	        S&ekmeleri\ Boşluklara\ Dönüştürmeyi\ Aç/Kapat<Tab>:set\ et!
-menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai!	        &Otomatik\ Girintilemeyi\ Aç/Kapat<Tab>:set\ ai!
-menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin!	    &C\ Tarzı\ Girintilemeyi\ Aç/Kapat<Tab>:set\ cin!
+menutrans Toggle\ &List\ Mode<Tab>:set\ list!			Gö&rünmeyen\ Karakterleri\ Aç/Kapat<Tab>:set\ list!
+menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap!		Sa&tır\ Kaydırmayı\ Aç/Kapat<Tab>:set\ wrap!
+menutrans Toggle\ W&rapping\ at\ Word<Tab>:set\ lbr!		Sö&zcük\ Kaydırmayı\ Aç/Kapat<Tab>:set\ lbr!
+menutrans Toggle\ Tab\ &Expanding-tab<Tab>:set\ et!		S&ekmeleri\ Boşluklara\ Dönüştürmeyi\ Aç/Kapat<Tab>:set\ et!
+menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai!		&Otomatik\ Girintilemeyi\ Aç/Kapat<Tab>:set\ ai!
+menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin!		&C\ Tarzı\ Girintilemeyi\ Aç/Kapat<Tab>:set\ cin!
 ">>>---
-menutrans &Shiftwidth			&Girinti\ Düzeyi
-menutrans Soft\ &Tabstop		&Sekme\ Genişliği
+menutrans &Shiftwidth		&Girinti\ Düzeyi
+menutrans Soft\ &Tabstop	&Sekme\ Genişliği
 menutrans Te&xt\ Width\.\.\.	&Metin\ Genişliği\.\.\.
 menutrans &File\ Format\.\.\.	&Dosya\ Biçimi\.\.\.
-"
-"
-"
+
 " Tools menu
-menutrans &Jump\ to\ This\ Tag<Tab>g^]		Ş&u\ Etikete\ Atla<Tab>g^]
-menutrans Jump\ &Back<Tab>^T				&Geri\ Dön<Tab>^T
-menutrans Build\ &Tags\ File				&Etiket\ Dosyası\ Oluştur
+menutrans &Jump\ to\ This\ Tag<Tab>g^]	Ş&u\ Etikete\ Atla<Tab>g^]
+menutrans Jump\ &Back<Tab>^T		&Geri\ Dön<Tab>^T
+menutrans Build\ &Tags\ File		&Etiket\ Dosyası\ Oluştur
 "-------------------
-menutrans &Folding					&Kıvırmalar
-menutrans &Spelling					&Yazım\ Denetimi
-menutrans &Diff						&Ayrımlar\ (diff)
+menutrans &Folding	&Kıvırmalar
+menutrans &Spelling	&Yazım\ Denetimi
+menutrans &Diff		&Ayrımlar\ (diff)
 "-------------------
-menutrans &Make<Tab>:make						&Derle<Tab>:make
-menutrans &List\ Errors<Tab>:cl					&Hataları\ Listele<Tab>:cl
-menutrans L&ist\ Messages<Tab>:cl!				İ&letileri\ Listele<Tab>:cl!
-menutrans &Next\ Error<Tab>:cn					Bir\ &Sonraki\ Hata<Tab>:cn
-menutrans &Previous\ Error<Tab>:cp				Bir\ Ö&nceki\ Hata<Tab>:cp
-menutrans &Older\ List<Tab>:cold				Daha\ &Eski\ Hatalar<Tab>:cold
-menutrans N&ewer\ List<Tab>:cnew				Daha\ &Yeni\ Hatalar<Tab>:cnew
-menutrans Error\ &Window						Hatalar\ &Penceresi
-menutrans Se&t\ Compiler						De&rleyici\ Seç
+menutrans &Make<Tab>:make			&Derle<Tab>:make
+menutrans &List\ Errors<Tab>:cl			&Hataları\ Listele<Tab>:cl
+menutrans L&ist\ Messages<Tab>:cl!		İ&letileri\ Listele<Tab>:cl!
+menutrans &Next\ Error<Tab>:cn			Bir\ &Sonraki\ Hata<Tab>:cn
+menutrans &Previous\ Error<Tab>:cp		Bir\ Ö&nceki\ Hata<Tab>:cp
+menutrans &Older\ List<Tab>:cold		Daha\ &Eski\ Hatalar<Tab>:cold
+menutrans N&ewer\ List<Tab>:cnew		Daha\ &Yeni\ Hatalar<Tab>:cnew
+menutrans Error\ &Window			Hatalar\ &Penceresi
+menutrans Se&t\ Compiler			De&rleyici\ Seç
 menutrans Show\ Compiler\ Se&ttings\ in\ Menu	Derleyici\ Ayarlarını\ Menüde\ &Göster 
 "-------------------
-menutrans &Convert\ to\ HEX<Tab>:%!xxd			HEX'e\ Dö&nüştür<Tab>:%!xxd
-menutrans Conve&rt\ Back<Tab>:%!xxd\ -r			HEX'&ten\ Dönüştür<Tab>:%!xxd\ -r
+menutrans &Convert\ to\ HEX<Tab>:%!xxd		HEX'e\ Dö&nüştür<Tab>:%!xxd
+menutrans Conve&rt\ Back<Tab>:%!xxd\ -r		HEX'&ten\ Dönüştür<Tab>:%!xxd\ -r
 ">>>---------------- Tools/Spelling
-menutrans &Spell\ Check\ On						Yazım\ Denetimini\ &Aç
-menutrans Spell\ Check\ &Off					Yazım\ Denetimini\ &Kapat
-menutrans To\ &Next\ Error<Tab>]s				Bir\ &Sonraki\ Hata<Tab>]s
-menutrans To\ &Previous\ Error<Tab>[s			Bir\ Ö&nceki\ Hata<Tab>[s
-menutrans Suggest\ &Corrections<Tab>z=			Dü&zeltme\ Öner<Tab>z=
+menutrans &Spell\ Check\ On			Yazım\ Denetimini\ &Aç
+menutrans Spell\ Check\ &Off			Yazım\ Denetimini\ &Kapat
+menutrans To\ &Next\ Error<Tab>]s		Bir\ &Sonraki\ Hata<Tab>]s
+menutrans To\ &Previous\ Error<Tab>[s		Bir\ Ö&nceki\ Hata<Tab>[s
+menutrans Suggest\ &Corrections<Tab>z=		Dü&zeltme\ Öner<Tab>z=
 menutrans &Repeat\ Correction<Tab>:spellrepall	Düzeltmeyi\ &Yinele<Tab>spellrepall
 "-------------------
-menutrans Set\ Language\ to\ "en"		Dili\ "en"\ yap
+menutrans Set\ Language\ to\ "en"	Dili\ "en"\ yap
 menutrans Set\ Language\ to\ "en_au"	Dili\ "en_au"\ yap
 menutrans Set\ Language\ to\ "en_ca"	Dili\ "en_ca"\ yap
 menutrans Set\ Language\ to\ "en_gb"	Dili\ "en_gb"\ yap
 menutrans Set\ Language\ to\ "en_nz"	Dili\ "en_nz"\ yap
 menutrans Set\ Language\ to\ "en_us"	Dili\ "en_us"\ yap
-menutrans &Find\ More\ Languages		&Başka\ Diller\ Bul
-let g:menutrans_set_lang_to =			'Dil Yükle'
-"
-"
+menutrans &Find\ More\ Languages	&Başka\ Diller\ Bul
+let g:menutrans_set_lang_to =		'Dil Yükle'
+
 " The Spelling popup menu
-"
-"
-let g:menutrans_spell_change_ARG_to =			'Düzeltilecek:\ "%s"\ ->'
+let g:menutrans_spell_change_ARG_to =		'Düzeltilecek:\ "%s"\ ->'
 let g:menutrans_spell_add_ARG_to_word_list =	'"%s"\ sözcüğünü\ sözlüğe\ ekle'
-let g:menutrans_spell_ignore_ARG =				'"%s"\ sözcüğünü\ yoksay'
+let g:menutrans_spell_ignore_ARG =		'"%s"\ sözcüğünü\ yoksay'
 ">>>---------------- Folds
-menutrans &Enable/Disable\ Folds<Tab>zi			&Kıvırmaları\ Aç/Kapat<Tab>zi
-menutrans &View\ Cursor\ Line<Tab>zv			İ&mlecin\ Olduğu\ Satırı\ Görüntüle<Tab>zv
+menutrans &Enable/Disable\ Folds<Tab>zi		&Kıvırmaları\ Aç/Kapat<Tab>zi
+menutrans &View\ Cursor\ Line<Tab>zv		İ&mlecin\ Olduğu\ Satırı\ Görüntüle<Tab>zv
 menutrans Vie&w\ Cursor\ Line\ Only<Tab>zMzx	Ya&lnızca\ İmlecin\ Olduğu\ Satırı\ Görüntüle<Tab>zMzx
-menutrans C&lose\ More\ Folds<Tab>zm			&Daha\ Fazla\ Kıvırma\ Kapat<Tab>zm
-menutrans &Close\ All\ Folds<Tab>zM				Bütün\ Kı&vırmaları\ Kapat<Tab>zM
-menutrans &Open\ All\ Folds<Tab>zR				Bü&tün\ Kıvırmaları\ Aç<Tab>zR
-menutrans O&pen\ More\ Folds<Tab>zr				D&aha\ Fazla\ Kıvırma\ Aç<Tab>zr
-menutrans Fold\ Met&hod							Kıvı&rma\ Yöntemi
-menutrans Create\ &Fold<Tab>zf					Kıvırma\ &Oluştur<Tab>zf
-menutrans &Delete\ Fold<Tab>zd					Kıvırma\ &Sil<Tab>zd
-menutrans Delete\ &All\ Folds<Tab>zD			Tü&m\ Kıvırmaları\ Sil<Tab>zD
-menutrans Fold\ col&umn\ Width					Kıvırma\ Sütunu\ &Genişliği
+menutrans C&lose\ More\ Folds<Tab>zm		&Daha\ Fazla\ Kıvırma\ Kapat<Tab>zm
+menutrans &Close\ All\ Folds<Tab>zM		Bütün\ Kı&vırmaları\ Kapat<Tab>zM
+menutrans &Open\ All\ Folds<Tab>zR		Bü&tün\ Kıvırmaları\ Aç<Tab>zR
+menutrans O&pen\ More\ Folds<Tab>zr		D&aha\ Fazla\ Kıvırma\ Aç<Tab>zr
+menutrans Fold\ Met&hod				Kıvı&rma\ Yöntemi
+menutrans Create\ &Fold<Tab>zf			Kıvırma\ &Oluştur<Tab>zf
+menutrans &Delete\ Fold<Tab>zd			Kıvırma\ &Sil<Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD		Tü&m\ Kıvırmaları\ Sil<Tab>zD
+menutrans Fold\ col&umn\ Width			Kıvırma\ Sütunu\ &Genişliği
 ">>>->>>----------- Tools/Folds/Fold Method
-menutrans M&anual		&El\ İle
-menutrans I&ndent		&Girinti
+menutrans M&anual	&El\ İle
+menutrans I&ndent	&Girinti
 menutrans E&xpression	İ&fade
-menutrans S&yntax		&Sözdizim
-menutrans Ma&rker		İ&mleyici
+menutrans S&yntax	&Sözdizim
+menutrans Ma&rker	İ&mleyici
 ">>>--------------- Tools/Diff
-menutrans &Update		&Güncelle
+menutrans &Update	&Güncelle
 menutrans &Get\ Block	Bloğu\ &Al
 menutrans &Put\ Block	Bloğu\ &Koy
 ">>>--------------- Tools/Diff/Error window
-menutrans &Update<Tab>:cwin		&Güncelle<Tab>:cwin
+menutrans &Update<Tab>:cwin	&Güncelle<Tab>:cwin
 menutrans &Close<Tab>:cclose	&Kapat<Tab>:cclose
-menutrans &Open<Tab>:copen		&Aç<Tab>:copen
-"
-"
+menutrans &Open<Tab>:copen	&Aç<Tab>:copen
+
 " Syntax menu
-"
-menutrans &Show\ File\ Types\ in\ Menu		Dosya\ Türlerini\ Menüde\ &Göster
-menutrans Set\ '&syntax'\ only				Yalnızca\ 'syntax'\ &Ayarla
-menutrans Set\ '&filetype'\ too				'filetype'\ İçin\ &de\ Ayarla
-menutrans &Off								&Kapat
-menutrans &Manual							&El\ İle
-menutrans A&utomatic						&Otomatik
-menutrans On/Off\ for\ &This\ File			&Bu\ Dosya\ İçin\ Aç/Kapat
-menutrans Co&lor\ Test						&Renk\ Testi
-menutrans &Highlight\ Test					&Vurgulama\ Testi
-menutrans &Convert\ to\ HTML				&HTML'ye\ Dönüştür
-"
-"
+menutrans &Show\ File\ Types\ in\ Menu	Dosya\ Türlerini\ Menüde\ &Göster
+menutrans Set\ '&syntax'\ only		Yalnızca\ 'syntax'\ &Ayarla
+menutrans Set\ '&filetype'\ too		'filetype'\ İçin\ &de\ Ayarla
+menutrans &Off				&Kapat
+menutrans &Manual			&El\ İle
+menutrans A&utomatic			&Otomatik
+menutrans On/Off\ for\ &This\ File	&Bu\ Dosya\ İçin\ Aç/Kapat
+menutrans Co&lor\ Test			&Renk\ Testi
+menutrans &Highlight\ Test		&Vurgulama\ Testi
+menutrans &Convert\ to\ HTML		&HTML'ye\ Dönüştür
+
 " Buffers menu
-"
 menutrans &Refresh\ menu	&Menüyü\ Güncelle
-menutrans Delete			&Sil
+menutrans Delete		&Sil
 menutrans &Alternate		Ö&teki
-menutrans &Next				So&nraki
-menutrans &Previous			Ön&ceki
+menutrans &Next			So&nraki
+menutrans &Previous		Ön&ceki
 menutrans [No\ File]		[Dosya\ Yok]
-"
-"
+
 " Window menu
-"
-menutrans &New<Tab>^Wn					Yeni\ &Pencere<Tab>^Wn
-menutrans S&plit<Tab>^Ws				Pencereyi\ &Böl<Tab>^Ws
-menutrans Sp&lit\ To\ #<Tab>^W^^		Pencereyi\ Başkasına\ Bö&l<Tab>^W^^
+menutrans &New<Tab>^Wn			Yeni\ &Pencere<Tab>^Wn
+menutrans S&plit<Tab>^Ws		Pencereyi\ &Böl<Tab>^Ws
+menutrans Sp&lit\ To\ #<Tab>^W^^	Pencereyi\ Başkasına\ Bö&l<Tab>^W^^
 menutrans Split\ &Vertically<Tab>^Wv	Pencereyi\ &Dikey\ Olarak\ Böl<Tab>^Wv
-menutrans Split\ File\ E&xplorer		Yeni\ Bölü&mde\ Dosya\ Gezginini\ Aç
+menutrans Split\ File\ E&xplorer	Yeni\ Bölü&mde\ Dosya\ Gezginini\ Aç
 "
-menutrans &Close<Tab>^Wc				Pen&cereyi\ Kapat<Tab>^Wc
-menutrans Close\ &Other(s)<Tab>^Wo		Diğer\ Pencerele&ri\ Kapat<Tab>^Wo
+menutrans &Close<Tab>^Wc		Pen&cereyi\ Kapat<Tab>^Wc
+menutrans Close\ &Other(s)<Tab>^Wo	Diğer\ Pencerele&ri\ Kapat<Tab>^Wo
 "
-menutrans Move\ &To						&Taşı
-menutrans Rotate\ &Up<Tab>^WR			&Yukarı\ Taşı<Tab>^WR
-menutrans Rotate\ &Down<Tab>^Wr			&Aşağı\ Taşı<Tab>^Wr
+menutrans Move\ &To		&Taşı
+menutrans Rotate\ &Up<Tab>^WR	&Yukarı\ Taşı<Tab>^WR
+menutrans Rotate\ &Down<Tab>^Wr	&Aşağı\ Taşı<Tab>^Wr
 "
-menutrans &Equal\ Size<Tab>^W=			&Eşit\ Boyut<Tab>^W=
-menutrans &Max\ Height<Tab>^W_			E&n\ Büyük\ Yükseklik<Tab>^W_
-menutrans M&in\ Height<Tab>^W1_			En\ Küçük\ Yüksekl&ik<Tab>^W1_
-menutrans Max\ &Width<Tab>^W\|			En\ Büyük\ Gen&işlik<Tab>^W\|
-menutrans Min\ Widt&h<Tab>^W1\|			En\ Küçük\ Genişli&k<Tab>^W1\|
+menutrans &Equal\ Size<Tab>^W=	&Eşit\ Boyut<Tab>^W=
+menutrans &Max\ Height<Tab>^W_	E&n\ Büyük\ Yükseklik<Tab>^W_
+menutrans M&in\ Height<Tab>^W1_	En\ Küçük\ Yüksekl&ik<Tab>^W1_
+menutrans Max\ &Width<Tab>^W\|	En\ Büyük\ Gen&işlik<Tab>^W\|
+menutrans Min\ Widt&h<Tab>^W1\|	En\ Küçük\ Genişli&k<Tab>^W1\|
+
 ">>>----------------- Window/Move To
-menutrans &Top<Tab>^WK					&Yukarı<Tab>^WK
-menutrans &Bottom<Tab>^WJ				&Aşağı<Tab>^WJ
-menutrans &Left\ Side<Tab>^WH			So&la<Tab>^WH
-menutrans &Right\ Side<Tab>^WL			&Sağa<Tab>^WL
-"
-"
+menutrans &Top<Tab>^WK		&Yukarı<Tab>^WK
+menutrans &Bottom<Tab>^WJ	&Aşağı<Tab>^WJ
+menutrans &Left\ Side<Tab>^WH	So&la<Tab>^WH
+menutrans &Right\ Side<Tab>^WL	&Sağa<Tab>^WL
+
 " The popup menu
-"
-"
-menutrans &Undo					&Geri\ Al
-menutrans Cu&t					&Kes
-menutrans &Copy					K&opyala
-menutrans &Paste				&Yapıştır
-menutrans &Delete				&Sil
-menutrans Select\ Blockwise		&Blok\ Biçiminde\ Seç
-menutrans Select\ &Word			Sö&zcük\ Seç
-menutrans Select\ &Sentence		&Tümce\ Seç
+menutrans &Undo			&Geri\ Al
+menutrans Cu&t			&Kes
+menutrans &Copy			K&opyala
+menutrans &Paste		&Yapıştır
+menutrans &Delete		&Sil
+menutrans Select\ Blockwise	&Blok\ Biçiminde\ Seç
+menutrans Select\ &Word		Sö&zcük\ Seç
+menutrans Select\ &Sentence	&Tümce\ Seç
 menutrans Select\ Pa&ragraph	&Paragraf\ Seç
-menutrans Select\ &Line			S&atır\ Seç
-menutrans Select\ &Block		Bl&ok\ Seç
-menutrans Select\ &All			Tümü&nü\ Seç
-"
+menutrans Select\ &Line		S&atır\ Seç
+menutrans Select\ &Block	Bl&ok\ Seç
+menutrans Select\ &All		Tümü&nü\ Seç
+
 " The GUI toolbar
-"
 if has("toolbar")
-  if exists("*Do_toolbar_tmenu")
-    delfun Do_toolbar_tmenu
-  endif
-  fun Do_toolbar_tmenu()
-    tmenu ToolBar.Open			Dosya Aç
-    tmenu ToolBar.Save			Dosya Kaydet
-    tmenu ToolBar.SaveAll		Tüm Dosyaları Kaydet
-    tmenu ToolBar.Print			Yazdır
-    tmenu ToolBar.Undo			Geri Al
-    tmenu ToolBar.Redo			Yinele
-    tmenu ToolBar.Cut			Kes
-    tmenu ToolBar.Copy			Kopyala
-    tmenu ToolBar.Paste			Yapıştır
-	tmenu ToolBar.Find			Bul...
-    tmenu ToolBar.FindNext		Sonrakini Bul
-    tmenu ToolBar.FindPrev		Öncekini Bul
-    tmenu ToolBar.Replace		Bul ve Değiştir...
-    if 0	" disabled; These are in the Windows menu
-      tmenu ToolBar.New			Yeni Pencere
-      tmenu ToolBar.WinSplit	Pencereyi Böl
-      tmenu ToolBar.WinMax		En Büyük Pencere Yüksekliği
-      tmenu ToolBar.WinMin		En Küçük Pencere Yüksekliği
-      tmenu ToolBar.WinClose	Pencereyi Kapat
-    endif
-    tmenu ToolBar.LoadSesn		Oturum Yükle
-    tmenu ToolBar.SaveSesn		Oturum Kaydet
-    tmenu ToolBar.RunScript		Betik Çalıştır
-    tmenu ToolBar.Make			Derle
-    tmenu ToolBar.Shell			Kabuk
-    tmenu ToolBar.RunCtags		Etiket Dosyası Oluştur
-    tmenu ToolBar.TagJump		Etikete Atla
-    tmenu ToolBar.Help			Yardım
-    tmenu ToolBar.FindHelp		Yardım Bul
-  endfun
+	if exists("*Do_toolbar_tmenu")
+		delfun Do_toolbar_tmenu
+	endif
+
+	fun Do_toolbar_tmenu()
+		tmenu ToolBar.Open	Dosya Aç
+		tmenu ToolBar.Save	Dosya Kaydet
+		tmenu ToolBar.SaveAll	Tüm Dosyaları Kaydet
+		tmenu ToolBar.Print	Yazdır
+		tmenu ToolBar.Undo	Geri Al
+		tmenu ToolBar.Redo	Yinele
+		tmenu ToolBar.Cut	Kes
+		tmenu ToolBar.Copy	Kopyala
+		tmenu ToolBar.Paste	Yapıştır
+		tmenu ToolBar.Find	Bul...
+		tmenu ToolBar.FindNext	Sonrakini Bul
+		tmenu ToolBar.FindPrev	Öncekini Bul
+		tmenu ToolBar.Replace	Bul ve Değiştir...
+		if 0	" disabled; These are in the Windows menu
+			tmenu ToolBar.New	Yeni Pencere
+			tmenu ToolBar.WinSplit	Pencereyi Böl
+			tmenu ToolBar.WinMax	En Büyük Pencere Yüksekliği
+			tmenu ToolBar.WinMin	En Küçük Pencere Yüksekliği
+			tmenu ToolBar.WinClose	Pencereyi Kapat
+		endif
+		tmenu ToolBar.LoadSesn	Oturum Yükle
+		tmenu ToolBar.SaveSesn	Oturum Kaydet
+		tmenu ToolBar.RunScript	Betik Çalıştır
+		tmenu ToolBar.Make	Derle
+		tmenu ToolBar.Shell	Kabuk
+		tmenu ToolBar.RunCtags	Etiket Dosyası Oluştur
+		tmenu ToolBar.TagJump	Etikete Atla
+		tmenu ToolBar.Help	Yardım
+		tmenu ToolBar.FindHelp	Yardım Bul
+	endfun
 endif
-"
-"
+
 " Dialog texts
-"
 " Find in help dialog
-"
-let g:menutrans_help_dialog = "Yardım için komut veya sözcük girin:\n\nEkleme Kipi komutlarını aramak için i_ ekleyin (örneğin i_CTRL-X)\nNormal Kip komutlarını aramak için _c ekleyin (örneğin с_<Del>)\nSeçenekler hakkında yardım almak için ' ekleyin (örneğin 'shiftwidth')"
-"
+let g:menutrans_help_dialog = "Yardım için komut veya sözcük girin:\n\nEkleme Kipi komutlarını aramak için i_ ekleyin (örneğin i_CTRL-X)\nNormal Kip komutlarını aramak için _c ekleyin (örneğin c_<Del>)\nSeçenekler hakkında yardım almak için ' ekleyin (örneğin 'shiftwidth')"
+
 " Searh path dialog
-"
 let g:menutrans_path_dialog = "Dosya araması için yol belirtin.\nDizin adları virgüllerle ayrılır."
-"
+
 " Tag files dialog
-"
 let g:menutrans_tags_dialog = "Etiket dosyası adları belirtin (virgülle ayırarak).\n"
-"
+
 " Text width dialog
-"
 let g:menutrans_textwidth_dialog = "Biçimlendirme için metin genişliğini belirtin.\nBiçimlendirme iptali için 0 girin."
-"
+
 " File format dialog
-"
 let g:menutrans_fileformat_dialog = "Dosya biçimi seçin"
 let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\nİ&ptal"
-"
 let menutrans_no_file = "[Dosya Yok]"
-
 let &cpo = s:keepcpo
-unlet s:keepcpo
+unlet s:keepcpo
\ No newline at end of file
diff --git a/runtime/syntax/2html.vim b/runtime/syntax/2html.vim
index 4a2d1d395..1e85bc509 100644
--- a/runtime/syntax/2html.vim
+++ b/runtime/syntax/2html.vim
@@ -1,6 +1,6 @@
 " Vim syntax support file
 " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2018 Nov 11
+" Last Change: 2019 Nov 13
 "
 " Additional contributors:
 "
@@ -20,8 +20,13 @@
 " this file uses line continuations
 let s:cpo_sav = &cpo
 let s:ls  = &ls
+let s:ei_sav = &eventignore
 set cpo&vim
 
+" HTML filetype can take a while to load/highlight if the destination file
+" already exists.
+set eventignore+=FileType
+
 let s:end=line('$')
 
 " Font
@@ -37,6 +42,14 @@ endif
 
 let s:settings = tohtml#GetUserSettings()
 
+if s:settings.use_xhtml
+  let s:html5 = 0
+elseif s:settings.use_css && !s:settings.no_pre
+  let s:html5 = 1
+else
+  let s:html5 = 0
+endif
+
 if !exists('s:FOLDED_ID')
   let s:FOLDED_ID  = hlID("Folded")     | lockvar s:FOLDED_ID
   let s:FOLD_C_ID  = hlID("FoldColumn") | lockvar s:FOLD_C_ID
@@ -69,9 +82,10 @@ if !empty(s:settings.prevent_copy)
   endif
 endif
 
-" When not in gui we can only guess the colors.
-" TODO - is this true anymore?
-if has("gui_running")
+" When gui colors are not supported, we can only guess the colors.
+" TODO - is this true anymore? Is there a way to ask the terminal what colors
+" each number means or read them from some file?
+if &termguicolors || has("gui_running")
   let s:whatterm = "gui"
 else
   let s:whatterm = "cterm"
@@ -352,6 +366,12 @@ if s:settings.use_css
 	  \ ]
   else
 
+    " New method: use generated content in the CSS. The only thing needed here
+    " is a span with no content, with an attribute holding the desired text.
+    "
+    " Old method: use an <input> element when text is unsectable. This is still
+    " used in conditional comments for Internet Explorer, where the new method
+    " doesn't work.
     "
     " Wrap the <input> in a <span> to allow fixing the stupid bug in some fonts
     " which cause browsers to display a 1px gap between lines when these
@@ -369,16 +389,26 @@ if s:settings.use_css
     " to use strchars(), because HTML specifies that the maxlength parameter
     " uses the number of unique codepoints for its limit.
     let wrapperfunc_lines += [
-	  \ '    if a:make_unselectable',
-	  \ '      return "<span ".a:extra_attrs."class=\"" . l:style_name .'.diffstyle.'"\">'.
-	  \                '<input'.s:unselInputType.' class=\"" . l:style_name .'.diffstyle.'"\"'.
-	  \                 ' value=\"".substitute(a:unformatted,''\s\+$'',"","")."\"'.
-	  \                 ' onselect=''this.blur(); return false;'''.
-	  \                 ' onmousedown=''this.blur(); return false;'''.
-	  \                 ' onclick=''this.blur(); return false;'''.
-	  \                 ' readonly=''readonly'''.
-	  \                 ' size=\"".strwidth(a:unformatted)."\"'.
-	  \                 (s:settings.use_xhtml ? '/' : '').'></span>"',
+	  \   '    if a:make_unselectable',
+	  \   '      return "<span ".a:extra_attrs."class=\"" . l:style_name .'.diffstyle.'"\"'
+	  \ ]
+    if s:settings.use_input_for_pc !=# 'all'
+      let wrapperfunc_lines[-1] .= ' " . "data-" . l:style_name . "-content=\"".a:text."\"'
+    endif
+    let wrapperfunc_lines[-1] .= '>'
+    if s:settings.use_input_for_pc !=# 'none'
+      let wrapperfunc_lines[-1] .=
+	    \                '<input'.s:unselInputType.' class=\"" . l:style_name .'.diffstyle.'"\"'.
+	    \                 ' value=\"".substitute(a:unformatted,''\s\+$'',"","")."\"'.
+	    \                 ' onselect=''this.blur(); return false;'''.
+	    \                 ' onmousedown=''this.blur(); return false;'''.
+	    \                 ' onclick=''this.blur(); return false;'''.
+	    \                 ' readonly=''readonly'''.
+	    \                 ' size=\"".strwidth(a:unformatted)."\"'.
+	    \                 (s:settings.use_xhtml ? '/' : '').'>'
+    endif
+    let wrapperfunc_lines[-1] .= '</span>"'
+    let wrapperfunc_lines += [
 	  \ '    else',
 	  \ '      return "<span ".a:extra_attrs."class=\"" . l:style_name .'. diffstyle .'"\">".a:text."</span>"'
 	  \ ]
@@ -501,27 +531,63 @@ else
   endfun
 endif
 if s:settings.prevent_copy =~# 'f'
-  " Note the <input> elements for fill spaces will have a single space for
-  " content, to allow active cursor CSS selection to work.
-  "
-  " Wrap the whole thing in a span for the 1px padding workaround for gaps.
-  function! s:FoldColumn_build(char, len, numfill, char2, class, click)
-    let l:input_open = "<input readonly='readonly'".s:unselInputType.
-	  \ " onselect='this.blur(); return false;'".
-	  \ " onmousedown='this.blur(); ".a:click." return false;'".
-	  \ " onclick='return false;' size='".
-	  \ string(a:len + (empty(a:char2) ? 0 : 1) + a:numfill) .
-	  \ "' "
-    let l:common_attrs = "class='FoldColumn' value='"
-    let l:input_close = (s:settings.use_xhtml ? "' />" : "'>")
-    return "<span class='".a:class."'>".
-	  \ l:input_open.l:common_attrs.repeat(a:char, a:len).
-	  \ (!empty(a:char2) ? a:char2 : "").
-	  \ l:input_close . "</span>"
-  endfun
-  function! s:FoldColumn_fill()
-    return s:FoldColumn_build('', s:foldcolumn, 0, '', 'FoldColumn', '')
-  endfun
+  if s:settings.use_input_for_pc ==# 'none'
+    " Simply space-pad to the desired width inside the generated content (note
+    " that the FoldColumn definition includes a whitespace:pre rule)
+    function! s:FoldColumn_build(char, len, numfill, char2, class, click)
+      return "<a href='#' class='".a:class."' onclick='".a:click."' data-FoldColumn-content='".
+	    \ repeat(a:char, a:len).a:char2.repeat(' ', a:numfill).
+	    \ "'></a>"
+    endfun
+    function! s:FoldColumn_fill()
+      return s:HtmlFormat(repeat(' ', s:foldcolumn), s:FOLD_C_ID, 0, "", 1)
+    endfun
+  else
+    " Note the <input> elements for fill spaces will have a single space for
+    " content, to allow active cursor CSS selection to work.
+    "
+    " Wrap the whole thing in a span for the 1px padding workaround for gaps.
+    "
+    " Build the function line by line containing only what is needed for the
+    " options in use for maximum code sharing with minimal branch logic for
+    " greater speed.
+    "
+    " Note, 'exec' commands do not recognize line continuations, so must
+    " concatenate lines rather than continue them.
+    let build_fun_lines = [
+	  \ 'function! s:FoldColumn_build(char, len, numfill, char2, class, click)',
+	  \ '  let l:input_open = "<input readonly=''readonly''".s:unselInputType.'.
+	  \ '          " onselect=''this.blur(); return false;''".'.
+	  \ '          " onmousedown=''this.blur(); ".a:click." return false;''".'.
+	  \ '          " onclick=''return false;'' size=''".'.
+	  \ '          string(a:len + (empty(a:char2) ? 0 : 1) + a:numfill) .'.
+	  \ '          "'' "',
+	  \ '  let l:common_attrs = "class=''FoldColumn'' value=''"',
+	  \ '  let l:input_close = (s:settings.use_xhtml ? "'' />" : "''>")'
+	  \ ]
+    if s:settings.use_input_for_pc ==# 'fallback'
+      let build_fun_lines += [
+	    \ '  let l:gen_content_link ='.
+	    \ '          "<a href=''#'' class=''FoldColumn'' onclick=''".a:click."'' data-FoldColumn-content=''".'.
+	    \ '          repeat(a:char, a:len).a:char2.repeat('' '', a:numfill).'.
+	    \ '          "''></a>"'
+	    \ ]
+    endif
+    let build_fun_lines += [
+	  \ '  return "<span class=''".a:class."''>".'.
+	  \ '          l:input_open.l:common_attrs.repeat(a:char, a:len).(a:char2).'.
+	  \ '          l:input_close.'.
+	  \ (s:settings.use_input_for_pc ==# 'fallback' ? 'l:gen_content_link.' : "").
+	  \ '          "</span>"',
+	  \ 'endfun'
+	  \ ]
+    " create the function we built line by line above
+    exec join(build_fun_lines, "\n")
+
+    function! s:FoldColumn_fill()
+      return s:FoldColumn_build(' ', s:foldcolumn, 0, '', 'FoldColumn', '')
+    endfun
+  endif
 else
   " For normal fold columns, simply space-pad to the desired width (note that
   " the FoldColumn definition includes a whitespace:pre rule)
@@ -755,7 +821,11 @@ call extend(s:lines, [
 " include encoding as close to the top as possible, but only if not already
 " contained in XML information (to avoid haggling over content type)
 if s:settings.encoding != "" && !s:settings.use_xhtml
-  call add(s:lines, "<meta http-equiv=\"content-type\" content=\"text/html; charset=" . s:settings.encoding . '"' . s:tag_close)
+  if s:html5
+    call add(s:lines, '<meta charset="' . s:settings.encoding . '"' . s:tag_close)
+  else
+    call add(s:lines, "<meta http-equiv=\"content-type\" content=\"text/html; charset=" . s:settings.encoding . '"' . s:tag_close)
+  endif
 endif
 call extend(s:lines, [
       \ ("<title>".expand("%:p:~")."</title>"),
@@ -766,6 +836,7 @@ call add(s:lines, '<meta name="syntax" content="'.s:current_syntax.'"'.s:tag_clo
 call add(s:lines, '<meta name="settings" content="'.
       \ join(filter(keys(s:settings),'s:settings[v:val]'),',').
       \ ',prevent_copy='.s:settings.prevent_copy.
+      \ ',use_input_for_pc='.s:settings.use_input_for_pc.
       \ '"'.s:tag_close)
 call add(s:lines, '<meta name="colorscheme" content="'.
       \ (exists('g:colors_name')
@@ -773,19 +844,21 @@ call add(s:lines, '<meta name="colorscheme" content="'.
       \ : 'none'). '"'.s:tag_close)
 
 if s:settings.use_css
+  call extend(s:lines, [
+	\ "<style" . (s:html5 ? "" : " type=\"text/css\"") . ">",
+	\ s:settings.use_xhtml ? "" : "<!--"])
+  let s:ieonly = []
   if s:settings.dynamic_folds
     if s:settings.hover_unfold
       " if we are doing hover_unfold, use css 2 with css 1 fallback for IE6
       call extend(s:lines, [
-	    \ "<style type=\"text/css\">",
-	    \ s:settings.use_xhtml ? "" : "<!--",
 	    \ ".FoldColumn { text-decoration: none; white-space: pre; }",
 	    \ "",
 	    \ "body * { margin: 0; padding: 0; }", "",
-	    \ ".open-fold   > .Folded { display: none;  }",
-	    \ ".open-fold   > .fulltext { display: inline; }",
-	    \ ".closed-fold > .fulltext { display: none;  }",
-	    \ ".closed-fold > .Folded { display: inline; }",
+	    \ ".open-fold   > span.Folded { display: none;  }",
+	    \ ".open-fold   > .fulltext   { display: inline; }",
+	    \ ".closed-fold > .fulltext   { display: none;  }",
+	    \ ".closed-fold > span.Folded { display: inline; }",
 	    \ "",
 	    \ ".open-fold   > .toggle-open   { display: none;   }",
 	    \ ".open-fold   > .toggle-closed { display: inline; }",
@@ -794,65 +867,60 @@ if s:settings.use_css
 	    \ "", "",
 	    \ '/* opening a fold while hovering won''t be supported by IE6 and other',
 	    \ "similar browsers, but it should fail gracefully. */",
-	    \ ".closed-fold:hover > .fulltext { display: inline; }",
+	    \ ".closed-fold:hover > .fulltext      { display: inline; }",
 	    \ ".closed-fold:hover > .toggle-filler { display: none; }",
-	    \ ".closed-fold:hover > .Folded { display: none; }",
-	    \ s:settings.use_xhtml ? "" : '-->',
-	    \ '</style>'])
-      " TODO: IE7 doesn't *actually* support XHTML, maybe we should remove this.
-      " But if it's served up as tag soup, maybe the following will work, so
-      " leave it in for now.
-      call extend(s:lines, [
+	    \ ".closed-fold:hover > .Folded        { display: none; }"])
+      " TODO: IE6 is REALLY old and I can't even test it anymore. Maybe we
+      " should remove this? Leave it in for now, it was working at one point,
+      " and doesn't affect any modern browsers. Even newer IE versions should
+      " support the above code and ignore the following.
+      let s:ieonly = [
 	    \ "<!--[if lt IE 7]><style type=\"text/css\">",
-	    \ ".open-fold   .Folded      { display: none; }",
 	    \ ".open-fold   .fulltext      { display: inline; }",
+	    \ ".open-fold   span.Folded    { display: none; }",
 	    \ ".open-fold   .toggle-open   { display: none; }",
-	    \ ".closed-fold .toggle-closed { display: inline; }",
+	    \ ".open-fold   .toggle-closed { display: inline; }",
 	    \ "",
 	    \ ".closed-fold .fulltext      { display: none; }",
-	    \ ".closed-fold .Folded      { display: inline; }",
+	    \ ".closed-fold span.Folded    { display: inline; }",
 	    \ ".closed-fold .toggle-open   { display: inline; }",
 	    \ ".closed-fold .toggle-closed { display: none; }",
 	    \ "</style>",
 	    \ "<![endif]-->",
-	    \])
+	    \]
     else
       " if we aren't doing hover_unfold, use CSS 1 only
       call extend(s:lines, [
-	    \ "<style type=\"text/css\">",
-	    \ s:settings.use_xhtml ? "" :"<!--",
 	    \ ".FoldColumn { text-decoration: none; white-space: pre; }",
-	    \ ".open-fold   .Folded      { display: none; }",
 	    \ ".open-fold   .fulltext      { display: inline; }",
+	    \ ".open-fold   span.Folded    { display: none; }",
 	    \ ".open-fold   .toggle-open   { display: none; }",
-	    \ ".closed-fold .toggle-closed { display: inline; }",
+	    \ ".open-fold   .toggle-closed { display: inline; }",
 	    \ "",
 	    \ ".closed-fold .fulltext      { display: none; }",
-	    \ ".closed-fold .Folded      { display: inline; }",
+	    \ ".closed-fold span.Folded    { display: inline; }",
 	    \ ".closed-fold .toggle-open   { display: inline; }",
 	    \ ".closed-fold .toggle-closed { display: none; }",
-	    \ s:settings.use_xhtml ? "" : '-->',
-	    \ '</style>'
 	    \])
     endif
-  else
-    " if we aren't doing any dynamic folding, no need for any special rules
-    call extend(s:lines, [
-	  \ "<style type=\"text/css\">",
-	  \ s:settings.use_xhtml ? "" : "<!--",
+  endif
+  " else we aren't doing any dynamic folding, no need for any special rules
+
+  call extend(s:lines, [
 	  \ s:settings.use_xhtml ? "" : '-->',
 	  \ "</style>",
 	  \])
-  endif
+  call extend(s:lines, s:ieonly)
+  unlet s:ieonly
 endif
 
-let s:uses_script = s:settings.dynamic_folds || s:settings.line_ids || !empty(s:settings.prevent_copy)
+let s:uses_script = s:settings.dynamic_folds || s:settings.line_ids
 
 " insert script tag if needed
 if s:uses_script
   call extend(s:lines, [
         \ "",
-        \ "<script type='text/javascript'>",
+        \ "<script" . (s:html5 ? "" : " type='text/javascript'") . ">",
         \ s:settings.use_xhtml ? '//<![CDATA[' : "<!--"])
 endif
 
@@ -924,65 +992,6 @@ if s:settings.line_ids
 	\ ])
 endif
 
-" Small text columns like the foldcolumn and line number column need a weird
-" hack to work around Webkit's and (in versions prior to 9) IE's lack of support
-" for the 'ch' unit without messing up Opera, which also doesn't support it but
-" works anyway.
-"
-" The problem is that without the 'ch' unit, it is not possible to specify a
-" size of an <input> in terms of character widths. Only Opera seems to do the
-" "sensible" thing and make the <input> sized to fit exactly as many characters
-" as specified by its "size" attribute, but the spec actually says "at least
-" wide enough to fit 'size' characters", so the other browsers are technically
-" correct as well.
-"
-" Anyway, this leads to two diffculties:
-"   1. The foldcolumn is made up of multiple elements side-by-side with
-"      different sizes, each of which has their own extra padding added. Thus, a
-"      column made up of one item of size 1 and another of size 2 would not
-"      necessarily be equal in size to another line's foldcolumn with a single
-"      item of size 3.
-"   2. The extra padding added to the <input> elements adds up to make the
-"      foldcolumn and line number column too wide, especially in Webkit
-"      browsers.
-"
-" So, the full workaround is:
-"   1. Define a default size in em, equal to the number of characters in the
-"      input element, in case javascript is disabled and the browser does not
-"      support the 'ch' unit. Unfortunately this makes Opera no longer work
-"      properly without javascript. 1em per character is much too wide but it
-"      looks better in webkit browsers than unaligned columns.
-"   2. Insert the following javascript to run at page load, which checks for the
-"      width of a single character (in an extraneous page element inserted
-"      before the page title, and set to hidden) and compares it to the width of
-"      another extra <input> element with only one character. If the width
-"      matches, the script does nothing more, but if not, it will figure out the
-"      fraction of an em unit which would correspond with a ch unit if there
-"      were one, and set the containing element (<pre> or <div>) to a class with
-"      pre-defined rules which is closest to that fraction of an em. Rules are
-"      defined from 0.05 em to 1em per ch.
-if !empty(s:settings.prevent_copy)
-  call extend(s:lines, [
-	\ '',
-	\ '/* simulate a "ch" unit by asking the browser how big a zero character is */',
-	\ 'function FixCharWidth() {',
-	\ '  /* get the hidden element which gives the width of a single character */',
-	\ '  var goodWidth = document.getElementById("oneCharWidth").clientWidth;',
-	\ '  /* get all input elements, we''ll filter on class later */',
-	\ '  var inputTags = document.getElementsByTagName("input");',
-	\ '  var ratio = 5;',
-	\ '  var inputWidth = document.getElementById("oneInputWidth").clientWidth;',
-	\ '  var emWidth = document.getElementById("oneEmWidth").clientWidth;',
-	\ '  if (inputWidth > goodWidth) {',
-	\ '    while (ratio < 100*goodWidth/emWidth && ratio < 100) {',
-	\ '      ratio += 5;',
-	\ '    }',
-	\ '    document.getElementById("vimCodeElement'.s:settings.id_suffix.'").className = "em"+ratio;',
-	\ '  }',
-	\ '}'
-	\ ])
-endif
-
 " insert script closing tag if needed
 if s:uses_script
   call extend(s:lines, [
@@ -992,18 +1001,9 @@ if s:uses_script
         \ ])
 endif
 
-call extend(s:lines, ["</head>"])
-if !empty(s:settings.prevent_copy)
-  call extend(s:lines,
-	\ ["<body onload='FixCharWidth();".(s:settings.line_ids ? " JumpToLine();" : "")."'>",
-	\ "<!-- hidden divs used by javascript to get the width of a char -->",
-	\ "<div id='oneCharWidth'>0</div>",
-	\ "<div id='oneInputWidth'><input size='1' value='0'".s:tag_close."</div>",
-	\ "<div id='oneEmWidth' style='width: 1em;'></div>"
-	\ ])
-else
-  call extend(s:lines, ["<body".(s:settings.line_ids ? " onload='JumpToLine();'" : "").">"])
-endif
+call extend(s:lines, ["</head>",
+      \ "<body".(s:settings.line_ids ? " onload='JumpToLine();'" : "").">"])
+
 if s:settings.no_pre
   " if we're not using CSS we use a font tag which can't have a div inside
   if s:settings.use_css
@@ -1035,14 +1035,68 @@ if !s:settings.no_progress
   let s:progressbar={}
 
   " Progessbar specific functions
+
+  func! s:SetProgbarColor()
+    if hlID("TOhtmlProgress") != 0
+      hi! link TOhtmlProgress_auto TOhtmlProgress
+    elseif hlID("TOhtmlProgress_auto")==0 ||
+       \ !exists("s:last_colors_name") || !exists("g:colors_name") ||
+       \ g:colors_name != s:last_colors_name
+      let s:last_colors_name = exists("g:colors_name") ? g:colors_name : "none"
+
+      let l:diffatr = synIDattr(hlID("DiffDelete"), "reverse", s:whatterm) ? "fg#" : "bg#"
+      let l:stlatr = synIDattr(hlID("StatusLine"), "reverse", s:whatterm) ? "fg#" : "bg#"
+
+      let l:progbar_color = synIDattr(hlID("DiffDelete"), l:diffatr, s:whatterm)
+      let l:stl_color = synIDattr(hlID("StatusLine"), l:stlatr, s:whatterm)
+
+      if "" == l:progbar_color
+	let l:progbar_color = synIDattr(hlID("DiffDelete"), "reverse", s:whatterm) ? s:fgc : s:bgc
+      endif
+      if "" == l:stl_color
+	let l:stl_color = synIDattr(hlID("StatusLine"), "reverse", s:whatterm) ? s:fgc : s:bgc
+      endif
+
+      if l:progbar_color == l:stl_color
+	if s:whatterm == 'cterm'
+	  if l:progbar_color >= (&t_Co/2)
+	    let l:progbar_color-=1
+	  else
+	    let l:progbar_color+=1
+	  endif
+	else
+	  let l:rgb = map(matchlist(l:progbar_color, '#\zs\x\x\ze\(\x\x\)\(\x\x\)')[:2], 'str2nr(v:val, 16)')
+	  let l:avg = (l:rgb[0] + l:rgb[1] + l:rgb[2])/3
+	  if l:avg >= 128
+	    let l:avg_new = l:avg
+	    while l:avg - l:avg_new < 0x15
+	      let l:rgb = map(l:rgb, 'v:val * 3 / 4')
+	      let l:avg_new = (l:rgb[0] + l:rgb[1] + l:rgb[2])/3
+	    endwhile
+	  else
+	    let l:avg_new = l:avg
+	    while l:avg_new - l:avg < 0x15
+	      let l:rgb = map(l:rgb, 'min([max([v:val, 4]) * 5 / 4, 255])')
+	      let l:avg_new = (l:rgb[0] + l:rgb[1] + l:rgb[2])/3
+	    endwhile
+	  endif
+	  let l:progbar_color = printf("#%02x%02x%02x", l:rgb[0], l:rgb[1], l:rgb[2])
+	endif
+	echomsg "diff detected progbar color set to" l:progbar_color
+      endif
+      exe "hi TOhtmlProgress_auto" s:whatterm."bg=".l:progbar_color
+    endif
+  endfun
+
   func! s:ProgressBar(title, max_value, winnr)
     let pgb=copy(s:progressbar)
     let pgb.title = a:title.' '
     let pgb.max_value = a:max_value
     let pgb.winnr = a:winnr
     let pgb.cur_value = 0
+
     let pgb.items = { 'title'   : { 'color' : 'Statusline' },
-	  \'bar'     : { 'color' : 'Statusline' , 'fillcolor' : 'DiffDelete' , 'bg' : 'Statusline' } ,
+	  \'bar'     : { 'color' : 'Statusline' , 'fillcolor' : 'TOhtmlProgress_auto' , 'bg' : 'Statusline' } ,
 	  \'counter' : { 'color' : 'Statusline' } }
     let pgb.last_value = 0
     let pgb.needs_redraw = 0
@@ -1134,6 +1188,8 @@ if !s:settings.no_progress
     " to process folds we make two passes through each line
     let s:pgb = s:ProgressBar("Processing folds:", line('$')*2, s:orgwin)
   endif
+
+  call s:SetProgbarColor()
 endif
 
 " First do some preprocessing for dynamic folding. Do this for the entire file
@@ -1577,28 +1633,44 @@ while s:lnum <= s:end
 	  let s:tabidx = 0
 	  let s:tabwidth = 0
 	  while s:idx >= 0
-	    while s:startcol+s:idx > s:tabwidth + s:tablist[s:tabidx] 
-	      let s:tabwidth += s:tablist[s:tabidx]
-	      if s:tabidx < len(s:tablist)-1
-		let s:tabidx = s:tabidx+1
-	      endif
-	    endwhile
-	    if has("multi_byte_encoding")
-	      if s:startcol + s:idx == 1
-		let s:i = s:tablist[s:tabidx]
+	    if s:startcol + s:idx == 1
+	      let s:i = s:tablist[0]
+	    else
+	      " Get the character, which could be multiple bytes, which falls
+	      " immediately before the found tab. Extract it by matching a
+	      " character just prior to the column where the tab matches.
+	      " We'll use this to get the byte index of the character
+	      " immediately preceding the tab, so we can then look up the
+	      " virtual column that character appears in, to determine how
+	      " much of the current tabstop has been used up.
+	      if s:idx == 0
+		" if the found tab is the first character in the text being
+		" processed, we need to get the character prior to the text,
+		" given by startcol.
+		let s:prevc = matchstr(s:line, '.\%' . (s:startcol + s:offset) . 'c')
 	      else
-		if s:idx == 0
-		  let s:prevc = matchstr(s:line, '.\%' . (s:startcol + s:idx + s:offset) . 'c')
-		else
-		  let s:prevc = matchstr(s:expandedtab, '.\%' . (s:idx + 1) . 'c')
-		endif
-		let s:vcol = virtcol([s:lnum, s:startcol + s:idx + s:offset - len(s:prevc)])
-		let s:i = s:tablist[s:tabidx] - (s:vcol - s:tabwidth)
+		" Otherwise, the byte index of the tab into s:expandedtab is
+		" given by s:idx.
+		let s:prevc = matchstr(s:expandedtab, '.\%' . (s:idx + 1) . 'c')
 	      endif
-	      let s:offset -= s:i - 1
-	    else
-	      let s:i = s:tablist[s:tabidx] - ((s:idx + s:startcol - 1) - s:tabwidth)
+	      let s:vcol = virtcol([s:lnum, s:startcol + s:idx + s:offset - len(s:prevc)])
+
+	      " find the tabstop interval to use for the tab we just found. Keep
+	      " adding tabstops (which could be variable) until we would exceed
+	      " the virtual screen position of the start of the found tab.
+	      while s:vcol >= s:tabwidth + s:tablist[s:tabidx]
+		let s:tabwidth += s:tablist[s:tabidx]
+		if s:tabidx < len(s:tablist)-1
+		  let s:tabidx = s:tabidx+1
+		endif
+	      endwhile
+	      let s:i = s:tablist[s:tabidx] - (s:vcol - s:tabwidth)
 	    endif
+	    " update offset to keep the index within the line corresponding to
+	    " actual tab characters instead of replaced spaces; s:idx reflects
+	    " replaced spaces in s:expandedtab, s:offset cancels out all but
+	    " the tab character itself.
+	    let s:offset -= s:i - 1
 	    let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', s:i), '')
 	    let s:idx = stridx(s:expandedtab, "\t")
 	  endwhile
@@ -1674,12 +1746,10 @@ call append(line('$'), "<!-- vim: set foldmethod=manual : -->")
 
 " Now, when we finally know which, we define the colors and styles
 if s:settings.use_css
-  1;/<style type="text/+1
+  1;/<style\>/+1
 endif
 
 " Normal/global attributes
-" For Netscape 4, set <body> attributes too, though, strictly speaking, it's
-" incorrect.
 if s:settings.use_css
   if s:settings.no_pre
     call append('.', "body { color: " . s:fgc . "; background-color: " . s:bgc . "; font-family: ". s:htmlfont ."; }")
@@ -1702,61 +1772,111 @@ if s:settings.use_css
   " if we use any input elements for unselectable content, make sure they look
   " like normal text
   if !empty(s:settings.prevent_copy)
-    call append('.', 'input { border: none; margin: 0; padding: 0; font-family: '.s:htmlfont.'; }')
-    +
-    " ch units for browsers which support them, em units for a somewhat
-    " reasonable fallback. Also make sure the special elements for size
-    " calculations aren't seen.
-    call append('.', [
-	  \ "input[size='1'] { width: 1em; width: 1ch; }",
-	  \ "input[size='2'] { width: 2em; width: 2ch; }",
-	  \ "input[size='3'] { width: 3em; width: 3ch; }",
-	  \ "input[size='4'] { width: 4em; width: 4ch; }",
-	  \ "input[size='5'] { width: 5em; width: 5ch; }",
-	  \ "input[size='6'] { width: 6em; width: 6ch; }",
-	  \ "input[size='7'] { width: 7em; width: 7ch; }",
-	  \ "input[size='8'] { width: 8em; width: 8ch; }",
-	  \ "input[size='9'] { width: 9em; width: 9ch; }",
-	  \ "input[size='10'] { width: 10em; width: 10ch; }",
-	  \ "input[size='11'] { width: 11em; width: 11ch; }",
-	  \ "input[size='12'] { width: 12em; width: 12ch; }",
-	  \ "input[size='13'] { width: 13em; width: 13ch; }",
-	  \ "input[size='14'] { width: 14em; width: 14ch; }",
-	  \ "input[size='15'] { width: 15em; width: 15ch; }",
-	  \ "input[size='16'] { width: 16em; width: 16ch; }",
-	  \ "input[size='17'] { width: 17em; width: 17ch; }",
-	  \ "input[size='18'] { width: 18em; width: 18ch; }",
-	  \ "input[size='19'] { width: 19em; width: 19ch; }",
-	  \ "input[size='20'] { width: 20em; width: 20ch; }",
-	  \ "#oneCharWidth, #oneEmWidth, #oneInputWidth { padding: 0; margin: 0; position: absolute; left: -999999px; visibility: hidden; }"
-	  \ ])
-    +21
-    for w in range(5, 100, 5)
-      let base = 0.01 * w
-      call append('.', join(map(range(1,20), "'.em'.w.' input[size='''.v:val.'''] { width: '.string(v:val*base).'em; }'")))
+    if s:settings.use_input_for_pc !=# "none"
+      call append('.', 'input { border: none; margin: 0; padding: 0; font-family: '.s:htmlfont.'; }')
       +
-    endfor
-    if s:settings.prevent_copy =~# 'f'
-    " Make the cursor show active fold columns as active areas, and empty fold
-    " columns as not interactive.
-      call append('.', ['input.FoldColumn { cursor: pointer; }',
-	    \ 'input.FoldColumn[value=""] { cursor: default; }'
-	    \ ])
-      +2
+      " ch units for browsers which support them, em units for a somewhat
+      " reasonable fallback.
+      for w in range(1, 20, 1)
+	call append('.', [
+	      \ "input[size='".w."'] { width: ".w."em; width: ".w."ch; }"
+	      \ ])
+	+
+      endfor
     endif
-    " make line number column show as non-interactive if not selectable
-    if s:settings.prevent_copy =~# 'n'
-      call append('.', 'input.LineNr { cursor: default; }')
-      +
+
+    if s:settings.use_input_for_pc !=# 'all'
+      let s:unselectable_styles = []
+      if s:settings.prevent_copy =~# 'f'
+	call add(s:unselectable_styles, 'FoldColumn')
+      endif
+      if s:settings.prevent_copy =~# 'n'
+	call add(s:unselectable_styles, 'LineNr')
+      endif
+      if s:settings.prevent_copy =~# 't' && !s:settings.ignore_folding
+	call add(s:unselectable_styles, 'Folded')
+      endif
+      if s:settings.prevent_copy =~# 'd'
+	call add(s:unselectable_styles, 'DiffDelete')
+      endif
+      if s:settings.use_input_for_pc !=# 'none'
+	call append('.', [
+	      \ '/* Note: IE does not support @supports conditionals, but also does not fully support',
+	      \ '   "content:" with custom content, so we *want* the check to fail */',
+	      \ '@supports ( content: attr(data-custom-content) ) {'
+	      \ ])
+	+3
+      endif
+      " The line number column inside the foldtext is styled just like the fold
+      " text in Vim, but it should use the prevent_copy settings of line number
+      " rather than fold text. Apply the prevent_copy styles to foldtext
+      " specifically for line numbers, which always come after the fold column,
+      " or at the beginning of the line.
+      if s:settings.prevent_copy =~# 'n' && !s:settings.ignore_folding
+	call append('.', [
+	      \ '  .FoldColumn + .Folded, .Folded:first-child { user-select: none; }',
+	      \ '  .FoldColumn + [data-Folded-content]::before, [data-Folded-content]:first-child::before { content: attr(data-Folded-content); }',
+	      \ '  .FoldColumn + [data-Folded-content]::before, [data-Folded-content]:first-child::before { padding-bottom: 1px; display: inline-block; /* match the 1-px padding of standard items with background */ }',
+	      \ '  .FoldColumn + span[data-Folded-content]::before, [data-Folded-content]:first-child::before { cursor: default; }',
+	      \ ])
+	+4
+      endif
+      for s:style_name in s:unselectable_styles
+	call append('.', [
+	      \ '  .'.s:style_name.' { user-select: none; }',
+	      \ '  [data-'.s:style_name.'-content]::before { content: attr(data-'.s:style_name.'-content); }',
+	      \ '  [data-'.s:style_name.'-content]::before { padding-bottom: 1px; display: inline-block; /* match the 1-px padding of standard items with background */ }',
+	      \ '  span[data-'.s:style_name.'-content]::before { cursor: default; }',
+	      \ ])
+	+4
+      endfor
+      if s:settings.use_input_for_pc !=# 'none'
+	call append('.', [
+	      \ '  input { display: none; }',
+	      \ '}'
+	      \ ])
+	+2
+      endif
+      unlet s:unselectable_styles
     endif
-    " make fold text and line number column within fold text show as
-    " non-interactive if not selectable
-    if (s:settings.prevent_copy =~# 'n' || s:settings.prevent_copy =~# 't') && !s:settings.ignore_folding
-      call append('.', 'input.Folded { cursor: default; }')
-      +
+
+    " Fix mouse cursor shape for the fallback <input> method of uncopyable text
+    if s:settings.use_input_for_pc !=# 'none'
+      if s:settings.prevent_copy =~# 'f'
+	" Make the cursor show active fold columns as active areas, and empty fold
+	" columns as not interactive.
+	call append('.', ['input.FoldColumn { cursor: pointer; }',
+	      \ 'input.FoldColumn[value="'.repeat(' ', s:foldcolumn).'"] { cursor: default; }'
+	      \ ])
+	+2
+	if s:settings.use_input_for_pc !=# 'all'
+	  call append('.', [
+		\ 'a[data-FoldColumn-content="'.repeat(' ', s:foldcolumn).'"] { cursor: default; }'
+		\ ])
+	  +1
+	end
+      endif
+      " make line number column show as non-interactive if not selectable
+      if s:settings.prevent_copy =~# 'n'
+	call append('.', 'input.LineNr { cursor: default; }')
+	+
+      endif
+      " make fold text and line number column within fold text show as
+      " non-interactive if not selectable
+      if (s:settings.prevent_copy =~# 'n' || s:settings.prevent_copy =~# 't') && !s:settings.ignore_folding
+	call append('.', 'input.Folded { cursor: default; }')
+	+
+      endif
+      " make diff filler show as non-interactive if not selectable
+      if s:settings.prevent_copy =~# 'd'
+	call append('.', 'input.DiffDelete { cursor: default; }')
+	+
+      endif
     endif
   endif
 else
+  " For Netscape 4, set <body> attributes too, though, strictly speaking, it's
+  " incorrect.
   execute '%s:<body\([^>]*\):<body bgcolor="' . s:bgc . '" text="' . s:fgc . '"\1>\r<font face="'. s:htmlfont .'"'
 endif
 
@@ -1779,8 +1899,8 @@ endif
 " The DTD
 if s:settings.use_xhtml
   exe "normal! gg$a\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">"
-elseif s:settings.use_css && !s:settings.no_pre
-  exe "normal! gg0i<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">\n"
+elseif s:html5
+  exe "normal! gg0i<!DOCTYPE html>\n"
 else
   exe "normal! gg0i<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n"
 endif
@@ -1823,6 +1943,7 @@ exec 'resize' s:old_winheight
 let &l:winfixheight = s:old_winfixheight
 
 let &ls=s:ls
+let &eventignore=s:ei_sav
 
 " Save a little bit of memory (worth doing?)
 unlet s:htmlfont s:whitespace
@@ -1831,7 +1952,7 @@ unlet s:old_magic s:old_more s:old_fen s:old_winheight
 unlet! s:old_isprint
 unlet s:whatterm s:stylelist s:diffstylelist s:lnum s:end s:margin s:fgc s:bgc s:old_winfixheight
 unlet! s:col s:id s:attr s:len s:line s:new s:expandedtab s:concealinfo s:diff_mode
-unlet! s:orgwin s:newwin s:orgbufnr s:idx s:i s:offset s:ls s:origwin_stl
+unlet! s:orgwin s:newwin s:orgbufnr s:idx s:i s:offset s:ls s:ei_sav s:origwin_stl
 unlet! s:newwin_stl s:current_syntax
 if !v:profiling
   delfunc s:HtmlColor
diff --git a/runtime/syntax/fortran.vim b/runtime/syntax/fortran.vim
index 4c26e78f1..562382367 100644
--- a/runtime/syntax/fortran.vim
+++ b/runtime/syntax/fortran.vim
@@ -1,17 +1,17 @@
 " Vim syntax file
 " Language:	Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
-" Version:	100
-" Last Change:	2016 Oct. 29
+" Version:	101
+" Last Change:	2019 Nov. 26
 " Maintainer:	Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
 " Usage:	For instructions, do :help fortran-syntax from Vim
 " Credits:
-"  Version 0.1 (April 2000) for Fortran 95 was based on the Fortran 77 syntax file by
-"  Mario Eusebio and Preben Guldberg. Since then, useful suggestions and contributions
-"  have been made, in chronological order, by:
+"  Version 0.1 for Fortran 95 was created (April 2000) by Ajit Thakkar from the
+"  Fortran 77 syntax file by Mario Eusebio and Preben Guldberg.
+"  Since then, useful suggestions and contributions have been made, in order, by:
 "  Andrej Panjkov, Bram Moolenaar, Thomas Olsen, Michael Sternberg, Christian Reile,
 "  Walter Dieudonn�, Alexander Wagner, Roman Bertle, Charles Rendleman,
 "  Andrew Griffiths, Joe Krahn, Hendrik Merx, Matt Thompson, Jan Hermann,
-"  Stefano Zaghi, Vishnu V. Krishnan and Judica�l Grasset
+"  Stefano Zaghi, Vishnu V. Krishnan, Judica�l Grasset, and Takuma Yoshida
 
 if exists("b:current_syntax")
   finish
@@ -92,9 +92,9 @@ else
   syn match fortranConstructName	"^\s*\zs\a\w*\ze\s*:"
 endif
 if exists("fortran_more_precise")
-  syn match fortranConstructName "\(\<end\s*do\s\+\)\@<=\a\w*"
-  syn match fortranConstructName "\(\<end\s*if\s\+\)\@<=\a\w*"
-  syn match fortranConstructName "\(\<end\s*select\s\+\)\@<=\a\w*"
+  syn match fortranConstructName "\(\<end\s*do\s\+\)\@11<=\a\w*"
+  syn match fortranConstructName "\(\<end\s*if\s\+\)\@11<=\a\w*"
+  syn match fortranConstructName "\(\<end\s*select\s\+\)\@15<=\a\w*"
 endif
 
 syn match fortranUnitHeader	"\<end\>"
@@ -185,8 +185,8 @@ syn match fortranLabelNumber	display	"^    \d\s"ms=s+4,me=e-1
 if exists("fortran_more_precise")
   " Numbers as targets
   syn match fortranTarget	display	"\(\<if\s*(.\+)\s*\)\@<=\(\d\+\s*,\s*\)\{2}\d\+\>"
-  syn match fortranTarget	display	"\(\<do\s\+\)\@<=\d\+\>"
-  syn match fortranTarget	display	"\(\<go\s*to\s*(\=\)\@<=\(\d\+\s*,\s*\)*\d\+\>"
+  syn match fortranTarget	display	"\(\<do\s\+\)\@<11=\d\+\>"
+  syn match fortranTarget	display	"\(\<go\s*to\s*(\=\)\@<11=\(\d\+\s*,\s*\)*\d\+\>"
 endif
 
 syn keyword fortranTypeR	external
@@ -274,7 +274,7 @@ syn match fortranType			"\<elemental\>"
 syn match fortranType			"\<pure\>"
 syn match fortranType			"\<impure\>"
 if exists("fortran_more_precise")
-  syn match fortranConstructName "\(\<end\s*forall\s\+\)\@<=\a\w*\>"
+  syn match fortranConstructName "\(\<end\s*forall\s\+\)\@<15=\a\w*\>"
 endif
 
 if b:fortran_dialect == "f08"
@@ -375,7 +375,8 @@ syn match	cPreProc		"^\s*#\s*\(define\|ifdef\)\>.*"
 syn match	cPreProc		"^\s*#\s*\(elif\|if\)\>.*"
 syn match	cPreProc		"^\s*#\s*\(ifndef\|undef\)\>.*"
 syn match	cPreCondit		"^\s*#\s*\(else\|endif\)\>.*"
-syn region	cIncluded	contained start=+"[^(]+ skip=+\\\\\|\\"+ end=+"+ contains=fortranLeftMargin,fortranContinueMark,fortranSerialNumber
+syn region	cIncluded	contained start=+"[^("]+ skip=+\\\\\|\\"+ end=+"+ contains=fortranLeftMargin,fortranContinueMark,fortranSerialNumber
+"syn region	cIncluded	        contained start=+"[^("]+ skip=+\\\\\|\\"+ end=+"+
 syn match	cIncluded		contained "<[^>]*>"
 syn match	cInclude		"^\s*#\s*include\>\s*["<]" contains=cIncluded
 
diff --git a/runtime/syntax/help.vim b/runtime/syntax/help.vim
index 673a54f98..a8d45a4af 100644
--- a/runtime/syntax/help.vim
+++ b/runtime/syntax/help.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	Vim help file
 " Maintainer:	Bram Moolenaar (Bram@vim.org)
-" Last Change:	2019 May 12
+" Last Change:	2019 Nov 26
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -90,6 +90,7 @@ syn match helpSpecial		"\[group]"
 syn match helpNormal		"\[\(readonly\|fifo\|socket\|converted\|crypted\)]"
 
 syn match helpSpecial		"CTRL-."
+syn match helpSpecial		"CTRL-SHIFT-."
 syn match helpSpecial		"CTRL-Break"
 syn match helpSpecial		"CTRL-PageUp"
 syn match helpSpecial		"CTRL-PageDown"